fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/BillController.java

@@ -1,22 +0,0 @@
-package com.management.platform.controller;
-
-import com.management.platform.service.BillService;
-import com.management.platform.util.HttpRespMsg;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-
-@RestController
-@RequestMapping("/bill")
-public class BillController {
-
-    @Resource
-    private BillService billService;
-
-    @RequestMapping("/getPrepayId")
-    public HttpRespMsg getPrepayId(Integer id,HttpServletRequest request) {
-        return billService.getPrepayId(id,request);
-    }
-}

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/Bill.java

@@ -1,82 +0,0 @@
-package com.management.platform.entity;
-
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-public class Bill extends Model<Bill> {
-	public static void main(String[] args) {
-		Date date = new Date();
-		SimpleDateFormat sdfYmd = new SimpleDateFormat("yyyy-MM-dd");
-		SimpleDateFormat sdfHms = new SimpleDateFormat("HH:mm:ss");
-		String format1 = sdfYmd.format(date);
-		String format2 = sdfHms.format(date);
-		String format = String.format("%sT%s+8:00", format1, format2);
-		System.out.println(format);
-	}
-
-	private static final long serialVersionUID=1L;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column bill.id
-	 * @mbg.generated  Mon Feb 25 20:47:33 CST 2019
-	 */
-	private Integer id;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column bill.seq
-	 * @mbg.generated  Mon Feb 25 20:47:33 CST 2019
-	 */
-	private String seq;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column bill.user_id
-	 * @mbg.generated  Mon Feb 25 20:47:33 CST 2019
-	 */
-	private String userId;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column bill.company_id
-	 * @mbg.generated  Mon Feb 25 20:47:33 CST 2019
-	 */
-	private String companyId;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column bill.mobile
-	 * @mbg.generated  Mon Feb 25 20:47:33 CST 2019
-	 */
-	private String mobile;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column bill.name
-	 * @mbg.generated  Mon Feb 25 20:47:33 CST 2019
-	 */
-	private String name;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column bill.pay_type
-	 * @mbg.generated  Mon Feb 25 20:47:33 CST 2019
-	 */
-	private String payType;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column bill.money
-	 * @mbg.generated  Mon Feb 25 20:47:33 CST 2019
-	 */
-	private Integer money;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column bill.result
-	 * @mbg.generated  Mon Feb 25 20:47:33 CST 2019
-	 */
-	private Integer result;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column bill.indate
-	 * @mbg.generated  Mon Feb 25 20:47:33 CST 2019
-	 */
-	private Date indate;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column bill.year
-	 * @mbg.generated  Mon Feb 25 20:47:33 CST 2019
-	 */
-	private Integer year;
-
-}

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/mapper/BillMapper.java

@@ -1,7 +0,0 @@
-package com.management.platform.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.management.platform.entity.Bill;
-
-public interface BillMapper extends BaseMapper<Bill> {
-}

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/BillService.java

@@ -1,11 +0,0 @@
-package com.management.platform.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.management.platform.entity.Bill;
-import com.management.platform.util.HttpRespMsg;
-
-import javax.servlet.http.HttpServletRequest;
-
-public interface BillService extends IService<Bill> {
-    HttpRespMsg getPrepayId(Integer id, HttpServletRequest request);
-}

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/BillServiceImpl.java

@@ -1,96 +0,0 @@
-package com.management.platform.service.impl;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.management.platform.entity.Bill;
-import com.management.platform.entity.User;
-import com.management.platform.mapper.BillMapper;
-import com.management.platform.mapper.UserMapper;
-import com.management.platform.service.BillService;
-import com.management.platform.util.HttpRespMsg;
-import org.apache.commons.codec.binary.Hex;
-import org.springframework.http.*;
-import org.springframework.stereotype.Service;
-import org.springframework.web.client.RestTemplate;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import java.security.SecureRandom;
-import java.text.SimpleDateFormat;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-
-@Service
-public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements BillService {
-
-    private static final String APP_ID = "wxaaf19cfbbe1ff950";
-
-    private static final String MAIN_COM = "https://api.mch.weixin.qq.com";
-
-    private static final String PRE_PAY_URL = "/v3/pay/transactions/jsapi";
-
-    @Resource
-    private BillMapper billMapper;
-
-    @Resource
-    private UserMapper userMapper;
-
-    public static void main(String[] args) {
-        SecureRandom secureRandom = new SecureRandom();
-        // 生成16字节的随机数据
-        byte[] randomBytes = new byte[16];
-        secureRandom.nextBytes(randomBytes);
-        String hex = Hex.encodeHexString(randomBytes).toUpperCase();
-        System.out.println(hex);
-    }
-
-
-    @Override
-    public HttpRespMsg getPrepayId(Integer id, HttpServletRequest request) {
-        HttpRespMsg httpRespMsg = new HttpRespMsg();
-        User user = userMapper.selectById(request.getHeader("TOKEN"));
-        RestTemplate restTemplate = new RestTemplate();
-        HttpHeaders headers = new HttpHeaders();
-        headers.setContentType(MediaType.APPLICATION_JSON);
-        headers.setAccept(Collections.singletonList(MediaType.APPLICATION_JSON));
-//        headers.add("Authorization", authCode);//TODO 设置签名认证auth
-
-        Bill bill = billMapper.selectById(id);
-        Date now = new Date();
-        String seq = new SimpleDateFormat("yyyyMMddHHmmss").format(now);
-        bill.setSeq(seq + (1000 + bill.getId()%1000));
-
-        Map<String, Object> requestBody = new HashMap<>();
-        requestBody.put("appid", APP_ID);
-//        requestBody.put("mchid", mchid);//TODO 商户号
-//        requestBody.put("description","")//TODO 商品真实信息
-        requestBody.put("out_trade_no",bill.getSeq());
-//        requestBody.put("notify_url",notify_url)//TODO 异步回调地址
-        Map<String,Object> amount = new HashMap<>();
-        amount.put("total",bill.getMoney());// TODO 此处默认库中money为分，如改动
-        amount.put("currency","CNY");
-        requestBody.put("amount",amount);
-
-        Map<String,Object> payer = new HashMap<>();
-//        payer.put("openid",openid);//TODO 用户在商户appid下的唯一标识 user.getXXX
-
-        HttpEntity<Object> requestEntity = new HttpEntity<>(requestBody, headers);
-        ResponseEntity<String> prepayResponse = restTemplate.exchange(
-                MAIN_COM+PRE_PAY_URL,
-                HttpMethod.POST,
-                requestEntity,
-                String.class
-        );
-        if (prepayResponse.getStatusCode() == HttpStatus.OK) {
-            String prepayJson = prepayResponse.getBody();
-            JSONObject jsonObject = JSON.parseObject(prepayJson);
-            String prepay_id = jsonObject.get("prepay_id").toString();
-            //TODO 更新prepay_id
-        }
-
-        return httpRespMsg;
-    }
-}

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/BillMapper.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.management.platform.mapper.BillMapper">
-
-</mapper>

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/ProjectMapper.xml

@@ -161,7 +161,7 @@
         <if test="projectId != null">
             AND a.id = #{projectId}
         </if>
-        <if test="status != null">
+        <if test="status != null and status != 0">
             AND a.status = #{status}
         </if>
         <if test="categoryId != null">