Merge branch 'dev' of http://172.16.90.250:3000/cqcarbon/carbon-platform into dev

carbon-back/carbon-back-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/CustomerCompanyInfo.java

@@ -16,6 +16,8 @@ public class CustomerCompanyInfo implements Serializable {
 
     private String fkCustomerId;
 
+    private String companyType;
+
     private String companyName;
 
     private String orgCode;
@@ -131,4 +133,12 @@ public class CustomerCompanyInfo implements Serializable {
     public void setModifiedTime(Date modifiedTime) {
         this.modifiedTime = modifiedTime;
     }
+
+    public String getCompanyType() {
+        return companyType;
+    }
+
+    public void setCompanyType(String companyType) {
+        this.companyType = companyType;
+    }
 }

carbon-back/carbon-back-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/GoodsOrderInfoDetailBo.java

@@ -0,0 +1,34 @@
+package com.hcloud.microserver.system.facade.carbon.entity;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel
+public class GoodsOrderInfoDetailBo {
+    @ApiModelProperty("主键")
+    private String guid;
+
+    @ApiModelProperty("商品名称")
+    private String goodsName;
+
+    @ApiModelProperty("商品价格")
+    private String goodsPrice;
+
+    @ApiModelProperty("商品销售数量")
+    private String saleNum;
+
+    @ApiModelProperty("商品金额")
+    private String amount;
+
+    @ApiModelProperty("商品编码")
+    private String goodsCode;
+
+    @ApiModelProperty("商品到期时间")
+    private String goodsSaleDate;
+
+    @ApiModelProperty("商品类型")
+    private String typeName;
+}

carbon-back/carbon-back-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/GoodsOrderInfoVo.java

@@ -0,0 +1,37 @@
+package com.hcloud.microserver.system.facade.carbon.entity;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+@ApiModel
+public class GoodsOrderInfoVo {
+    @ApiModelProperty("主键")
+    private String guid;
+    @ApiModelProperty("订单编码")
+    private String orderNo;
+    @ApiModelProperty("支付编码")
+    private String payNo;
+    @ApiModelProperty("创建时间")
+    private String createTime;
+    @ApiModelProperty("用户名称")
+    private String customerName;
+    @ApiModelProperty("用户类型")
+    private String customerType;
+    @ApiModelProperty("订单是否失效 记录状态 0无效 1有效")
+    private String state;
+    @ApiModelProperty("账号")
+    private String account;
+    @ApiModelProperty("企业账号")
+    private String phone;
+    @ApiModelProperty("用户类型")
+    private String typeName;
+    @ApiModelProperty("支付状态")
+    private String payChannel;
+
+    List<GoodsOrderInfoDetailBo> goodsOrderDetailList = new ArrayList<>();
+}

carbon-back/carbon-back-common/src/main/java/com/hcloud/microserver/system/facade/carbon/forms/CustomerCompanyInfoForm.java

@@ -17,6 +17,10 @@ public class CustomerCompanyInfoForm extends BaseForm {
     private String guid;
 
     private String fkCustomerId;
+    /**
+     * 企业类型
+     */
+    private String companyType;
 
     private String companyName;
 
@@ -45,5 +49,4 @@ public class CustomerCompanyInfoForm extends BaseForm {
 
     private List<String> imageList;
 
-    private Integer companyType;
 }

carbon-back/carbon-back-common/src/main/java/com/hcloud/microserver/system/facade/carbon/forms/GoodsOrderInfoForm.java

@@ -54,11 +54,11 @@ public class GoodsOrderInfoForm extends BaseForm {
     /**
      * 购买起始时间
      */
-    private String beginDate;
+    private String beginTime;
     /**
      * 购买结束时间
      */
-    private String endDate;
+    private String endTime;
     /**
      * 客户账号
      */

carbon-back/carbon-back-common/src/main/java/com/hcloud/microserver/system/facade/carbon/forms/OfflineOrderCondidtionForm.java

@@ -25,5 +25,4 @@ public class OfflineOrderCondidtionForm extends BaseForm {
     private Integer orderStatus;
     @ApiModelProperty("企业账号")
     private String account;
-
 }

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/bank/bo/CustomerBO.java

@@ -0,0 +1,26 @@
+package com.hcloud.microserver.system.bank.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+/**
+ * @Author liql
+ * @Date 2020-11-29
+ */
+@Data
+@ApiModel("客户实体信息")
+public class CustomerBO {
+
+    @ApiModelProperty("订单数据唯一主键")
+    private String guid;
+
+    @ApiModelProperty("账号")
+    private String account;
+
+    @ApiModelProperty("企业名称")
+    private String companyName;
+
+    @ApiModelProperty("客户类型")
+    private Integer customerType;
+
+}

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/bank/bo/OfflineOrderBO.java

@@ -81,4 +81,7 @@ public class OfflineOrderBO {
     @ApiModelProperty("订单类型")
     private String orderType;
 
+    @ApiModelProperty("状态:1.未付款. 2.已完成（线上线下订单都完全完成了）3.未审核,4.后台审核等待打款, 5.已经打款等待再次审核")
+    private int status;
+
 }

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/bank/bo/OfflineOrderDetailBO.java

@@ -45,6 +45,8 @@ public class OfflineOrderDetailBO {
     private String phone;
     @ApiModelProperty("客户类型")
     private String customerTypeName;
+    @ApiModelProperty("状态:1.未付款. 2.已完成（线上线下订单都完全完成了）3.未审核,4.后台审核等待打款, 5.已经打款等待再次审核")
+    private int status;
     @ApiModelProperty("订单项列表")
     List<OfflineOrderItemBO> items;
 

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/bank/bo/OfflineOrderItemBO.java

@@ -26,5 +26,8 @@ public class OfflineOrderItemBO {
     private BigDecimal saleNum;
     @ApiModelProperty("金额")
     private BigDecimal amount;
+    @ApiModelProperty("认购期")
+    private String subscriptionDate;
+
 
 }

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/bank/bo/OrderInfoBO.java

@@ -1,5 +1,6 @@
 package com.hcloud.microserver.system.bank.bo;
 
+import io.swagger.annotations.ApiModel;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -9,6 +10,7 @@ import java.util.Date;
  * @author xiezt
  */
 @Data
+@ApiModel
 public class OrderInfoBO {
 
     /**
@@ -44,6 +46,8 @@ public class OrderInfoBO {
      * 订单状态
      */
     private String orderStatus;
+
+    private String statusNum;
     /**
      * 购买时间
      */

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/bank/controller/CustomerInfoController.java

@@ -1,6 +1,8 @@
 package com.hcloud.microserver.system.bank.controller;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.github.pagehelper.PageInfo;
+import com.hcloud.microserver.commoncore.base.ResultVO;
 import com.hcloud.microserver.system.bank.service.CustomerInfoService;
 import com.hcloud.microserver.commoncore.base.BaseController;
 import com.hcloud.microserver.commoncore.base.ResponseBase;
@@ -8,10 +10,11 @@ import com.hcloud.microserver.system.facade.carbon.forms.CustomerInfoForm;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @author JYJ
@@ -55,4 +58,24 @@ public class CustomerInfoController extends BaseController {
             return responseResultSuccess();
         }
         return responseResultFailure();    }
+
+    /**
+     *
+     * 查询客户列表
+     * @return
+     */
+    @ApiOperation(value = "客户列表")
+    @GetMapping("/coustomer-list")
+    public ResponseBase customerList(String companyName) {
+        ResultVO resultVO = new ResultVO();
+        if (ObjectUtil.isNotEmpty(companyName)) {
+            List<Map> list = customerInfoService.queryCustomList(companyName);
+            resultVO.setData(list);
+            resultVO.setCount(list.size());
+        }else{
+            resultVO.setData(new ArrayList());
+            resultVO.setCount(0);
+        }
+        return responseSuccess(resultVO);
+    }
 }

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/bank/controller/OrderDetailController.java

@@ -22,7 +22,6 @@ public class OrderDetailController extends BaseController {
     @ApiOperation("分页查询订单详细信息")
     @GetMapping("/searchByOrderGuid")
     public ResponseBase searchByOrderGuid(@RequestParam(name = "orderGuid") String orderGuid) {
-        List<GoodsOrderDetail> goodsOrderDetails = this.orderDetailInfoService.findByGoodsOrderInfoGuid(orderGuid);
-        return responseResultSuccess(goodsOrderDetails);
+        return responseResultSuccess(this.orderDetailInfoService.findByGoodsOrderInfoGuid(orderGuid));
     }
 }

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/bank/controller/OrderInfoController.java

@@ -3,9 +3,7 @@ package com.hcloud.microserver.system.bank.controller;
 import com.github.pagehelper.PageInfo;
 import com.hcloud.microserver.commoncore.base.ResultVO;
 import com.hcloud.microserver.commoncore.enums.ResultEnum;
-import com.hcloud.microserver.system.bank.bo.CreateOrderBO;
-import com.hcloud.microserver.system.bank.bo.OfflineOrderDetailBO;
-import com.hcloud.microserver.system.bank.bo.OrderInfoBO;
+import com.hcloud.microserver.system.bank.bo.*;
 import com.hcloud.microserver.system.bank.service.OrderInfoService;
 import com.hcloud.microserver.commoncore.base.BaseController;
 import com.hcloud.microserver.commoncore.base.ResponseBase;
@@ -32,6 +30,13 @@ public class OrderInfoController extends BaseController {
         PageInfo pageInfo = orderInfoService.searchOrderInfoByPage(goodsOrderInfoForm);
         return responseSuccess(pageInfo);
     }
+    @ApiOperation("证书查看")
+    @GetMapping("/credential")
+    public ResponseBase<CredentialInfoBO> searchCredentialInfoBO(@RequestParam(name = "guid") String guid) {
+        CredentialInfoBO credentialInfoBO = orderInfoService.searchCredentialInfo(guid);
+        return responseResultSuccess(credentialInfoBO);
+    }
+
 
     /**
      * 创建订单：
@@ -61,7 +66,7 @@ public class OrderInfoController extends BaseController {
 
     @ApiOperation("查询线下订单列表")
     @GetMapping("/offline-order-list")
-    public ResponseBase<OrderInfoBO> queryOfflineOrderList(@RequestBody OfflineOrderCondidtionForm condidtionForm) {
+    public ResponseBase<OfflineOrderBO> queryOfflineOrderList(OfflineOrderCondidtionForm condidtionForm) {
         PageInfo pageInfo = orderInfoService.offlineOrderList(condidtionForm);
         return responseSuccess(pageInfo);
     }

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/bank/controller/ProductTypeController.java

@@ -86,7 +86,7 @@ public class ProductTypeController extends CarbonBaseController {
     }
 
     @ApiOperation("查询所有产品类型2")
-    @GetMapping("/getAll")
+    @GetMapping("/all")
     public ResponseBase getAll() {
         List<Map> list = this.productTypeService.getAll();
         return responseResultSuccess(list);

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/bank/dao/CustomerInfoMapper.java

@@ -1,5 +1,6 @@
 package com.hcloud.microserver.system.bank.dao;
 
+import com.hcloud.microserver.system.bank.bo.CustomerBO;
 import com.hcloud.microserver.system.bank.bo.CustomerInfoBO;
 import com.hcloud.microserver.commoncore.base.BaseMapper;
 import com.hcloud.microserver.commoncore.base.PageBean;
@@ -8,6 +9,7 @@ import com.hcloud.microserver.system.facade.carbon.forms.CustomerInfoForm;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author xiezt
@@ -50,4 +52,17 @@ public interface CustomerInfoMapper extends BaseMapper<CustomerInfo,String> {
      */
     CustomerInfoBO getCustomerStatisticalInfo(@Param("cusId") String customerId);
 
+    /**
+     * 查询客户列表
+     * @return
+     */
+    List<Map> queryCustomList(@Param("companyName") String companyName);
+
+    /**
+     * 根据guid查询客户相关信息
+     * @param guid
+     * @return
+     */
+    CustomerBO queryCustomerInfoByGuid(@Param("guid") String guid);
+
 }

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/bank/dao/GoodsOrderDetailMapper.java

@@ -4,6 +4,8 @@ import com.hcloud.microserver.system.bank.bo.OfflineOrderItemBO;
 import com.hcloud.microserver.system.bank.bo.OrderDetailInfoBO;
 import com.hcloud.microserver.commoncore.base.BaseMapper;
 import com.hcloud.microserver.system.facade.carbon.entity.GoodsOrderDetail;
+import com.hcloud.microserver.system.facade.carbon.entity.GoodsOrderInfoDetailBo;
+import com.hcloud.microserver.system.facade.carbon.entity.GoodsOrderInfoVo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -26,7 +28,7 @@ public interface GoodsOrderDetailMapper extends BaseMapper<GoodsOrderDetail,Stri
      */
     int batchSaveOrderDetailList(List<GoodsOrderDetail> list);
 
-    List<GoodsOrderDetail> selectByGoodsOrderInfoGuid(@Param("goodsOrderInfoGuid") String goodsOrderInfoGuid);
+    GoodsOrderInfoVo selectByGoodsOrderInfoGuid(@Param("goodsOrderInfoGuid") String goodsOrderInfoGuid);
 
     /**
      * 根据订单guid查询订单项
@@ -34,4 +36,6 @@ public interface GoodsOrderDetailMapper extends BaseMapper<GoodsOrderDetail,Stri
      * @return
      */
     List<OfflineOrderItemBO> queryOrderDetail(@Param("orderGuid") String orderGuid);
+
+    List<GoodsOrderInfoDetailBo> findByGoodsOrderDetailByOrderId(@Param("orderGuid") String orderGuid);
 }

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/bank/dao/GoodsOrderInfoMapper.java

@@ -1,5 +1,6 @@
 package com.hcloud.microserver.system.bank.dao;
 
+import com.hcloud.microserver.system.bank.bo.CredentialInfoBO;
 import com.hcloud.microserver.system.bank.bo.OfflineOrderBO;
 import com.hcloud.microserver.system.bank.bo.OfflineOrderDetailBO;
 import com.hcloud.microserver.system.bank.bo.OrderInfoBO;
@@ -59,4 +60,6 @@ public interface GoodsOrderInfoMapper extends BaseMapper<GoodsOrderInfo,String>
      * @return
      */
     OfflineOrderDetailBO queryOfflineOrderDetial(@Param("guid") String guid);
+
+    CredentialInfoBO searchCredentialInfo(@Param("guid") String guid);
 }

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/bank/service/CustomerInfoService.java

@@ -2,7 +2,13 @@ package com.hcloud.microserver.system.bank.service;
 
 import com.github.pagehelper.PageInfo;
 import com.hcloud.microserver.commoncore.base.BaseServie;
+import com.hcloud.microserver.system.bank.bo.CustomerBO;
+import com.hcloud.microserver.system.bank.bo.CustomerInfoBO;
 import com.hcloud.microserver.system.facade.carbon.forms.CustomerInfoForm;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * @author xiezt
@@ -82,4 +88,17 @@ public interface CustomerInfoService extends BaseServie<CustomerInfoForm,String>
      * @return
      */
     int bindCustomerPhone(String customerId, String phone);
+
+    /**
+     * 查询客户列表
+     * @return
+     */
+    List<Map> queryCustomList(String companyName);
+
+    /**
+     * 根据guid查询客户相关信息
+     * @param guid
+     * @return
+     */
+    CustomerBO queryCustomerInfoByGuid(@Param("guid") String guid);
 }

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/bank/service/OrderDetailInfoService.java

@@ -1,7 +1,7 @@
 package com.hcloud.microserver.system.bank.service;
 
 import com.hcloud.microserver.commoncore.base.BaseServie;
-import com.hcloud.microserver.system.facade.carbon.entity.GoodsOrderDetail;
+import com.hcloud.microserver.system.facade.carbon.entity.GoodsOrderInfoVo;
 import com.hcloud.microserver.system.facade.carbon.forms.GoodsOrderDetailForm;
 
 import java.util.List;
@@ -24,5 +24,5 @@ public interface OrderDetailInfoService extends BaseServie<GoodsOrderDetailForm,
      */
     int batchSaveOrderDetailByList(List<GoodsOrderDetailForm> batchList);
 
-    List<GoodsOrderDetail> findByGoodsOrderInfoGuid(String goodsOrderInfoGuid);
+    GoodsOrderInfoVo findByGoodsOrderInfoGuid(String goodsOrderInfoGuid);
 }

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/bank/service/OrderInfoService.java

@@ -3,6 +3,7 @@ package com.hcloud.microserver.system.bank.service;
 import com.github.pagehelper.PageInfo;
 import com.hcloud.microserver.commoncore.base.BaseServie;
 import com.hcloud.microserver.system.bank.bo.CreateOrderBO;
+import com.hcloud.microserver.system.bank.bo.CredentialInfoBO;
 import com.hcloud.microserver.system.bank.bo.OfflineOrderBO;
 import com.hcloud.microserver.system.bank.bo.OfflineOrderDetailBO;
 import com.hcloud.microserver.system.facade.carbon.forms.GoodsOrderInfoForm;
@@ -110,4 +111,5 @@ public interface OrderInfoService extends BaseServie<GoodsOrderInfoForm,String>
      */
     int collectMoneyDeal(OfflineOrderPayVoucherForm payVoucher);
 
+    CredentialInfoBO searchCredentialInfo(String orderId);
 }

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/bank/service/impl/CustomerInfoServiceImpl.java

@@ -2,6 +2,7 @@ package com.hcloud.microserver.system.bank.service.impl;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.hcloud.microserver.system.bank.bo.CustomerBO;
 import com.hcloud.microserver.system.bank.bo.CustomerInfoBO;
 import com.hcloud.microserver.system.bank.dao.*;
 import com.hcloud.microserver.system.bank.enums.LoginChannelEnum;
@@ -24,6 +25,7 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 
 /**
@@ -314,5 +316,24 @@ public class CustomerInfoServiceImpl implements CustomerInfoService {
         return customerInfoMapper.updateByPrimaryKey(customerInfo);
     }
 
+    /**
+     * 查询客户列表
+     *
+     * @return
+     */
+    @Override
+    public List<Map> queryCustomList(String companyName) {
+        return customerInfoMapper.queryCustomList(companyName);
+    }
 
+    /**
+     * 根据guid查询客户相关信息
+     *
+     * @param guid
+     * @return
+     */
+    @Override
+    public CustomerBO queryCustomerInfoByGuid(String guid) {
+        return customerInfoMapper.queryCustomerInfoByGuid(guid);
+    }
 }

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/bank/service/impl/OrderDetailInfoServiceImpl.java

@@ -6,8 +6,11 @@ import com.hcloud.microserver.system.bank.service.OrderDetailInfoService;
 import com.hcloud.microserver.commoncore.util.BeanCopyUtil;
 import com.hcloud.microserver.commoncore.util.GetUUID;
 import com.hcloud.microserver.system.facade.carbon.entity.GoodsOrderDetail;
+import com.hcloud.microserver.system.facade.carbon.entity.GoodsOrderInfoDetailBo;
+import com.hcloud.microserver.system.facade.carbon.entity.GoodsOrderInfoVo;
 import com.hcloud.microserver.system.facade.carbon.forms.GoodsOrderDetailForm;
 import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
 
 import javax.annotation.Resource;
 import java.util.List;
@@ -52,8 +55,13 @@ public class OrderDetailInfoServiceImpl implements OrderDetailInfoService {
     }
 
     @Override
-    public List<GoodsOrderDetail> findByGoodsOrderInfoGuid(String goodsOrderInfoGuid) {
-        return this.goodsOrderDetailMapper.selectByGoodsOrderInfoGuid(goodsOrderInfoGuid);
+    public GoodsOrderInfoVo findByGoodsOrderInfoGuid(String goodsOrderInfoGuid) {
+        GoodsOrderInfoVo goodsOrderInfoVo = this.goodsOrderDetailMapper.selectByGoodsOrderInfoGuid(goodsOrderInfoGuid);
+        if(!StringUtils.isEmpty(goodsOrderInfoVo)){
+            List<GoodsOrderInfoDetailBo> list =  goodsOrderDetailMapper.findByGoodsOrderDetailByOrderId(goodsOrderInfoGuid);
+            goodsOrderInfoVo.setGoodsOrderDetailList(list);
+        }
+        return goodsOrderInfoVo;
     }
 
     @Override

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/bank/service/impl/OrderInfoServiceImpl.java

@@ -376,8 +376,10 @@ public class OrderInfoServiceImpl implements OrderInfoService {
     @Transactional
     public int createOrder(CreateOrderBO createOrderBO) {
         //查询商品信息
-        Map<String,String> queryParam = new HashMap<String,String>();
-        queryParam.put("productTypeId",createOrderBO.getProductTypeGuid());
+        Map<String,Object> queryParam = new HashMap<String,Object>();
+        String productTypes = createOrderBO.getProductTypeGuid();
+        String[] productArray = productTypes.split(";");
+        queryParam.put("productTypeIds",productArray);
         queryParam.put("villageId",createOrderBO.getVillageId());
         List<QueryGoodsInfoBO> goodsList = goodsInfoService.queryGoodsInfoByProductTypeAndArea(queryParam);
         if(goodsList.size()==0){
@@ -385,10 +387,10 @@ public class OrderInfoServiceImpl implements OrderInfoService {
         }
 
         //查询客户信息
-        CustomerInfoForm customer = customerInfoService.getCustomerInfoById(createOrderBO.getApplyCostomerId());
+        CustomerBO customer = customerInfoService.queryCustomerInfoByGuid(createOrderBO.getApplyCostomerId());
         //保存主订单
         GoodsOrderInfo order = new GoodsOrderInfo();
-        order.setCustomerName(customer.getCustomerName());
+        order.setCustomerName(customer.getCompanyName());
         order.setFkCustomerGuid(customer.getGuid());
         order.setCustomerType(customer.getCustomerType().toString());
 
@@ -521,21 +523,40 @@ public class OrderInfoServiceImpl implements OrderInfoService {
     public int collectMoneyDeal(OfflineOrderPayVoucherForm payVoucher) {
         //更新订单状态
         String payNo = UUIDUtils.randomUUID();
-        GoodsOrderInfo order = new GoodsOrderInfo();
+        GoodsOrderInfo order = goodsOrderInfoMapper.selectByPrimaryKey(payVoucher.getOrderId());
         order.setGuid(payVoucher.getOrderId());
         order.setPayNo(payNo);
         order.setOrderAmount(payVoucher.getPayAmount());
         order.setOrderStatus(2);
         order.setModifiedTime(new Date());
-        order.setModifiedUser(SecurityUtils.getUserId()==null?"1":SecurityUtils.getUserId().toString());
+        order.setModifiedUser(SecurityUtils.getUserId().toString());
         goodsOrderInfoMapper.updateByPrimaryKeySelective(order);
         //保存收款凭证
         int result = orderPayVoucherService.newSavePayVoucher(payVoucher);
         //保存证书
         applicationContext.publishEvent(new CredentialInfoEvent(new Object(),payVoucher.getOrderId()));
+        //保存支付订单
+        GoodsPayOrderForm form = new GoodsPayOrderForm();
+        form.setFkCustomerId(payVoucher.getCustomerId());
+        form.setFkOrderId(payVoucher.getOrderId());
+        form.setPayAmount(payVoucher.getPayAmount());
+        form.setPayChannel(4);
+        form.setPayStatus(2);
+        form.setPayTime(new Date());
+        form.setCreateTime(new Date());
+        form.setModifiedTime(new Date());
+        form.setState(1);
+        form.setPayNo(order.getPayNo());
+        form.setOrderNo(order.getOrderNo());
+        orderPayService.saveSelective(form);
+
         return result;
     }
 
+    public CredentialInfoBO searchCredentialInfo(String orderId){
+        return goodsOrderInfoMapper.searchCredentialInfo(orderId);
+    }
+
     @Override
     public int delByPrimaryKey(String guid) {
         return goodsOrderInfoMapper.deleteByPrimaryKey(guid);

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/bank/service/impl/OrderPayVoucherServiceImpl.java

@@ -163,7 +163,7 @@ public class OrderPayVoucherServiceImpl implements OrderPayVoucherService {
         record.setPayCardNo(payVoucher.getPayCardNo());
         record.setPayUserName(payVoucher.getPayUserName());
         record.setVoucherImages(payVoucher.getVoucherImages());
-        Date payTime = DateUtils.dateTime(DateUtils.YYYY_MM_DD_HH_MM_SS,payVoucher.getPayTime());
+        Date payTime = DateUtils.dateTime(DateUtils.YYYY_MM_DD,payVoucher.getPayTime());
         record.setPayTime(payTime);
         return orderPayVoucherMapper.insertSelective(record);
     }

carbon-back/carbon-back-service/src/main/resources/carbon/CustomerCompanyInfoMapper.xml

@@ -56,6 +56,9 @@
             <if test="fkCustomerId != null">
                 fk_customer_id,
             </if>
+            <if test="companyType != null">
+                company_type,
+            </if>
             <if test="companyName != null">
                 company_name,
             </if>
@@ -94,6 +97,9 @@
             <if test="fkCustomerId != null">
                 #{fkCustomerId,jdbcType=CHAR},
             </if>
+            <if test="companyType != null">
+                #{companyType,jdbcType=CHAR},
+            </if>
             <if test="companyName != null">
                 #{companyName,jdbcType=VARCHAR},
             </if>
@@ -133,6 +139,9 @@
             <if test="fkCustomerId != null">
                 fk_customer_id = #{fkCustomerId,jdbcType=CHAR},
             </if>
+            <if test="companyType != null">
+                company_type = #{companyType,jdbcType=VARCHAR},
+            </if>
             <if test="companyName != null">
                 company_name = #{companyName,jdbcType=VARCHAR},
             </if>
@@ -169,6 +178,7 @@
     <update id="updateByPrimaryKey" parameterType="com.hcloud.microserver.system.facade.carbon.entity.CustomerCompanyInfo">
         update t_customer_company_info
         set fk_customer_id = #{fkCustomerId,jdbcType=CHAR},
+        company_type = #{companyType,jdbcType=VARCHAR},
         company_name = #{companyName,jdbcType=VARCHAR},
         org_code = #{orgCode,jdbcType=VARCHAR},
         principals = #{principals,jdbcType=VARCHAR},

carbon-back/carbon-back-service/src/main/resources/carbon/CustomerInfoMapper.xml

@@ -65,6 +65,7 @@
        aa.is_enable as isEnable,
        aa.wx_id as wxId,
        aa.phone,
+       aa.sex,
        CASE aa.sex
       WHEN 1 THEN
           '男'
@@ -398,4 +399,32 @@
       modified_time = #{modifiedTime,jdbcType=TIMESTAMP}
     where guid = #{guid,jdbcType=CHAR}
   </update>
+  <!-- 查询客户列表 c.state = 0 AND c.is_enable = 1 and c.customer_type != 1 -->
+  <select id="queryCustomList" resultType="Map" parameterType="String">
+    SELECT
+      c.guid,
+      cc.company_name AS companyName
+    FROM
+        t_customer_info c
+    LEFT JOIN t_customer_company_info cc ON c.guid = cc.fk_customer_id
+    <where>
+        <if test="companyName!=null and companyName!=''">
+          cc.company_name LIKE CONCAT('%',#{companyName},'%')
+        </if>
+
+    </where>
+  </select>
+  <!-- 根据查询guid查询客户相关信息-->
+  <select id="queryCustomerInfoByGuid" parameterType="String" resultType="com.hcloud.microserver.system.bank.bo.CustomerBO">
+    SELECT
+      c.guid,
+      c.account,
+      c.customer_type AS customerType,
+      cc.company_name AS companyName
+    FROM
+        t_customer_info c
+    LEFT JOIN t_customer_company_info cc ON c.guid = cc.fk_customer_id
+    WHERE
+        c.guid= #{guid}
+  </select>
 </mapper>

carbon-back/carbon-back-service/src/main/resources/carbon/GoodsInfoMapper.xml

@@ -481,6 +481,16 @@
                 FROM t_goods_detail d JOIN t_goods_info g ON d.fk_goods_guid=g.guid
                                                             JOIN t_product_info p ON p.guid=d.fk_product_guid
                                                             JOIN t_poverty_area a ON a.guid=p.fk_poverty_area
-                WHERE p.fk_product_type=#{productTypeId} and a.village_id=#{villageId}
+                <where>
+                    <if test="villageId != null and villageId != ''">
+                        and a.village_id=#{villageId}
+                    </if>
+                    <if test="productTypeIds != null and productTypeIds != ''">
+                        and p.fk_product_type in
+                        <foreach item="productTypeId" collection="productTypeIds" open="(" separator="," close=")">
+                            #{productTypeId}
+                        </foreach>
+                    </if>
+                </where>
     </select>
 </mapper>

carbon-back/carbon-back-service/src/main/resources/carbon/GoodsOrderDetailMapper.xml

@@ -1,30 +1,30 @@
 <?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.hcloud.microserver.system.bank.dao.GoodsOrderDetailMapper">
-  <resultMap id="BaseResultMap" type="com.hcloud.microserver.system.facade.carbon.entity.GoodsOrderDetail">
-    <id column="guid" jdbcType="CHAR" property="guid" />
-    <result column="fk_order_guid" jdbcType="CHAR" property="fkOrderGuid" />
-    <result column="fk_goods_guid" jdbcType="CHAR" property="fkGoodsGuid" />
-    <result column="goods_name" jdbcType="VARCHAR" property="goodsName" />
-    <result column="goods_price" jdbcType="DECIMAL" property="goodsPrice" />
-    <result column="sale_num" jdbcType="DECIMAL" property="saleNum" />
-    <result column="amount" jdbcType="DECIMAL" property="amount" />
-    <result column="state" jdbcType="INTEGER" property="state" />
-    <result column="create_user" jdbcType="CHAR" property="createUser" />
-    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
-    <association property="goodsInfo" column="fk_goods_guid"
-                 select="GoodsInfoMapper.selectByPrimaryKey"/>
-  </resultMap>
-  <sql id="Base_Column_List">
+    <resultMap id="BaseResultMap" type="com.hcloud.microserver.system.facade.carbon.entity.GoodsOrderDetail">
+        <id column="guid" jdbcType="CHAR" property="guid"/>
+        <result column="fk_order_guid" jdbcType="CHAR" property="fkOrderGuid"/>
+        <result column="fk_goods_guid" jdbcType="CHAR" property="fkGoodsGuid"/>
+        <result column="goods_name" jdbcType="VARCHAR" property="goodsName"/>
+        <result column="goods_price" jdbcType="DECIMAL" property="goodsPrice"/>
+        <result column="sale_num" jdbcType="DECIMAL" property="saleNum"/>
+        <result column="amount" jdbcType="DECIMAL" property="amount"/>
+        <result column="state" jdbcType="INTEGER" property="state"/>
+        <result column="create_user" jdbcType="CHAR" property="createUser"/>
+        <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
+        <association property="goodsInfo" column="fk_goods_guid"
+                     select="com.hcloud.microserver.system.bank.dao.GoodsInfoMapper.selectByPrimaryKey"/>
+    </resultMap>
+    <sql id="Base_Column_List">
     guid, fk_order_guid, fk_goods_guid, goods_name, goods_price, sale_num, amount, state, 
     create_user, create_time
   </sql>
-  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
-    select 
-    <include refid="Base_Column_List" />
-    from t_goods_order_detail
-    where guid = #{guid,jdbcType=CHAR}
-  </select>
+    <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List"/>
+        from t_goods_order_detail
+        where guid = #{guid,jdbcType=CHAR}
+    </select>
     <select id="getOrderDetailListByOrderId" parameterType="java.lang.String"
             resultType="com.hcloud.microserver.system.bank.bo.OrderDetailInfoBO">
       SELECT
@@ -52,7 +52,7 @@
     delete from t_goods_order_detail
     where guid = #{guid,jdbcType=CHAR}
   </delete>
-  <insert id="insert" parameterType="com.hcloud.microserver.system.facade.carbon.entity.GoodsOrderDetail">
+    <insert id="insert" parameterType="com.hcloud.microserver.system.facade.carbon.entity.GoodsOrderDetail">
     insert into t_goods_order_detail (guid, fk_order_guid, fk_goods_guid, 
       goods_name, goods_price, sale_num, 
       amount, state, create_user, 
@@ -62,118 +62,119 @@
       #{amount,jdbcType=DECIMAL}, #{state,jdbcType=INTEGER}, #{createUser,jdbcType=CHAR}, 
       #{createTime,jdbcType=TIMESTAMP})
   </insert>
-  <insert id="batchSaveOrderDetailList">
+    <insert id="batchSaveOrderDetailList">
         insert into t_goods_order_detail (guid, fk_order_guid, fk_goods_guid,
-      goods_name, goods_price, sale_num,
-      amount, state,create_time) values
-      <foreach collection="list" item="bean" separator="," open="" close="">
-       ( REPLACE(UUID(),'-',''), #{bean.fkOrderGuid,jdbcType=CHAR}, #{bean.fkGoodsGuid,jdbcType=CHAR},
-        #{bean.goodsName,jdbcType=VARCHAR}, #{bean.goodsPrice,jdbcType=DECIMAL}, #{bean.saleNum,jdbcType=DECIMAL},
-        #{bean.amount,jdbcType=DECIMAL}, #{bean.state,jdbcType=INTEGER},#{bean.createTime,jdbcType=TIMESTAMP})
-      </foreach>
-  </insert>
-  <insert id="insertSelective" parameterType="com.hcloud.microserver.system.facade.carbon.entity.GoodsOrderDetail">
-    insert into t_goods_order_detail
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="guid != null">
-        guid,
-      </if>
-      <if test="fkOrderGuid != null">
-        fk_order_guid,
-      </if>
-      <if test="fkGoodsGuid != null">
-        fk_goods_guid,
-      </if>
-      <if test="goodsName != null">
-        goods_name,
-      </if>
-      <if test="goodsPrice != null">
-        goods_price,
-      </if>
-      <if test="saleNum != null">
-        sale_num,
-      </if>
-      <if test="amount != null">
-        amount,
-      </if>
-      <if test="state != null">
-        state,
-      </if>
-      <if test="createUser != null">
-        create_user,
-      </if>
-      <if test="createTime != null">
-        create_time,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="guid != null">
-        #{guid,jdbcType=CHAR},
-      </if>
-      <if test="fkOrderGuid != null">
-        #{fkOrderGuid,jdbcType=CHAR},
-      </if>
-      <if test="fkGoodsGuid != null">
-        #{fkGoodsGuid,jdbcType=CHAR},
-      </if>
-      <if test="goodsName != null">
-        #{goodsName,jdbcType=VARCHAR},
-      </if>
-      <if test="goodsPrice != null">
-        #{goodsPrice,jdbcType=DECIMAL},
-      </if>
-      <if test="saleNum != null">
-        #{saleNum,jdbcType=DECIMAL},
-      </if>
-      <if test="amount != null">
-        #{amount,jdbcType=DECIMAL},
-      </if>
-      <if test="state != null">
-        #{state,jdbcType=INTEGER},
-      </if>
-      <if test="createUser != null">
-        #{createUser,jdbcType=CHAR},
-      </if>
-      <if test="createTime != null">
-        #{createTime,jdbcType=TIMESTAMP},
-      </if>
-    </trim>
-  </insert>
+        goods_name, goods_price, sale_num,
+        amount, state,create_time) values
+        <foreach collection="list" item="bean" separator="," open="" close="">
+            ( REPLACE(UUID(),'-',''), #{bean.fkOrderGuid,jdbcType=CHAR}, #{bean.fkGoodsGuid,jdbcType=CHAR},
+            #{bean.goodsName,jdbcType=VARCHAR}, #{bean.goodsPrice,jdbcType=DECIMAL}, #{bean.saleNum,jdbcType=DECIMAL},
+            #{bean.amount,jdbcType=DECIMAL}, #{bean.state,jdbcType=INTEGER},#{bean.createTime,jdbcType=TIMESTAMP})
+        </foreach>
+    </insert>
+    <insert id="insertSelective" parameterType="com.hcloud.microserver.system.facade.carbon.entity.GoodsOrderDetail">
+        insert into t_goods_order_detail
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="guid != null">
+                guid,
+            </if>
+            <if test="fkOrderGuid != null">
+                fk_order_guid,
+            </if>
+            <if test="fkGoodsGuid != null">
+                fk_goods_guid,
+            </if>
+            <if test="goodsName != null">
+                goods_name,
+            </if>
+            <if test="goodsPrice != null">
+                goods_price,
+            </if>
+            <if test="saleNum != null">
+                sale_num,
+            </if>
+            <if test="amount != null">
+                amount,
+            </if>
+            <if test="state != null">
+                state,
+            </if>
+            <if test="createUser != null">
+                create_user,
+            </if>
+            <if test="createTime != null">
+                create_time,
+            </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="guid != null">
+                #{guid,jdbcType=CHAR},
+            </if>
+            <if test="fkOrderGuid != null">
+                #{fkOrderGuid,jdbcType=CHAR},
+            </if>
+            <if test="fkGoodsGuid != null">
+                #{fkGoodsGuid,jdbcType=CHAR},
+            </if>
+            <if test="goodsName != null">
+                #{goodsName,jdbcType=VARCHAR},
+            </if>
+            <if test="goodsPrice != null">
+                #{goodsPrice,jdbcType=DECIMAL},
+            </if>
+            <if test="saleNum != null">
+                #{saleNum,jdbcType=DECIMAL},
+            </if>
+            <if test="amount != null">
+                #{amount,jdbcType=DECIMAL},
+            </if>
+            <if test="state != null">
+                #{state,jdbcType=INTEGER},
+            </if>
+            <if test="createUser != null">
+                #{createUser,jdbcType=CHAR},
+            </if>
+            <if test="createTime != null">
+                #{createTime,jdbcType=TIMESTAMP},
+            </if>
+        </trim>
+    </insert>
 
-  <update id="updateByPrimaryKeySelective" parameterType="com.hcloud.microserver.system.facade.carbon.entity.GoodsOrderDetail">
-    update t_goods_order_detail
-    <set>
-      <if test="fkOrderGuid != null">
-        fk_order_guid = #{fkOrderGuid,jdbcType=CHAR},
-      </if>
-      <if test="fkGoodsGuid != null">
-        fk_goods_guid = #{fkGoodsGuid,jdbcType=CHAR},
-      </if>
-      <if test="goodsName != null">
-        goods_name = #{goodsName,jdbcType=VARCHAR},
-      </if>
-      <if test="goodsPrice != null">
-        goods_price = #{goodsPrice,jdbcType=DECIMAL},
-      </if>
-      <if test="saleNum != null">
-        sale_num = #{saleNum,jdbcType=DECIMAL},
-      </if>
-      <if test="amount != null">
-        amount = #{amount,jdbcType=DECIMAL},
-      </if>
-      <if test="state != null">
-        state = #{state,jdbcType=INTEGER},
-      </if>
-      <if test="createUser != null">
-        create_user = #{createUser,jdbcType=CHAR},
-      </if>
-      <if test="createTime != null">
-        create_time = #{createTime,jdbcType=TIMESTAMP},
-      </if>
-    </set>
-    where guid = #{guid,jdbcType=CHAR}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.hcloud.microserver.system.facade.carbon.entity.GoodsOrderDetail">
+    <update id="updateByPrimaryKeySelective"
+            parameterType="com.hcloud.microserver.system.facade.carbon.entity.GoodsOrderDetail">
+        update t_goods_order_detail
+        <set>
+            <if test="fkOrderGuid != null">
+                fk_order_guid = #{fkOrderGuid,jdbcType=CHAR},
+            </if>
+            <if test="fkGoodsGuid != null">
+                fk_goods_guid = #{fkGoodsGuid,jdbcType=CHAR},
+            </if>
+            <if test="goodsName != null">
+                goods_name = #{goodsName,jdbcType=VARCHAR},
+            </if>
+            <if test="goodsPrice != null">
+                goods_price = #{goodsPrice,jdbcType=DECIMAL},
+            </if>
+            <if test="saleNum != null">
+                sale_num = #{saleNum,jdbcType=DECIMAL},
+            </if>
+            <if test="amount != null">
+                amount = #{amount,jdbcType=DECIMAL},
+            </if>
+            <if test="state != null">
+                state = #{state,jdbcType=INTEGER},
+            </if>
+            <if test="createUser != null">
+                create_user = #{createUser,jdbcType=CHAR},
+            </if>
+            <if test="createTime != null">
+                create_time = #{createTime,jdbcType=TIMESTAMP},
+            </if>
+        </set>
+        where guid = #{guid,jdbcType=CHAR}
+    </update>
+    <update id="updateByPrimaryKey" parameterType="com.hcloud.microserver.system.facade.carbon.entity.GoodsOrderDetail">
     update t_goods_order_detail
     set fk_order_guid = #{fkOrderGuid,jdbcType=CHAR},
       fk_goods_guid = #{fkGoodsGuid,jdbcType=CHAR},
@@ -187,22 +188,69 @@
     where guid = #{guid,jdbcType=CHAR}
   </update>
 
-  <select id="selectByGoodsOrderInfoGuid" parameterType="string" resultMap="BaseResultMap">
-    select
-      <include refid="Base_Column_List"/>
-    from t_goods_order_detail
-    where state = 1
-    and fk_order_guid = #{goodsOrderInfoGuid,jdbcType=VARCHAR}
+    <select id="selectByGoodsOrderInfoGuid" parameterType="string" resultType="com.hcloud.microserver.system.facade.carbon.entity.GoodsOrderInfoVo">
+
+        SELECT
+            b.guid AS guid,
+            b.order_no AS orderNo,
+            b.pay_no AS payNo,
+            b.create_time AS createTime,
+            b.customer_name AS customerName,
+            b.customer_type AS customerType,
+            b.state AS state,
+            c.account AS account,
+            c.phone AS phone,
+            IFNULL(d.type_name,'自然人') AS typeName,
+            e.pay_channel AS payChannel
+        FROM
+            t_goods_order_info b
+        LEFT JOIN t_customer_info c ON b.fk_customer_guid = c.guid
+        LEFT JOIN t_goods_pay_order e ON e.fk_order_id = b.guid
+        LEFT JOIN t_customer_company_info f ON f.fk_customer_id = b.fk_customer_guid
+        LEFT JOIN t_customer_company_type d ON d.guid = f.company_type
+
+        WHERE
+            b.state = 1
+        AND e.pay_status = 2
+        AND b.guid = #{goodsOrderInfoGuid}
+        LIMIT 1
   </select>
-  <!-- 根据订单guid查询订单项 -->
-  <select id="queryOrderDetail" parameterType="String" resultType="com.hcloud.microserver.system.bank.bo.OfflineOrderItemBO">
+    <!-- 根据订单guid查询订单项 -->
+    <select id="queryOrderDetail" parameterType="String"
+            resultType="com.hcloud.microserver.system.bank.bo.OfflineOrderItemBO">
     SELECT g.goods_code AS goodsCode,
 			 g.goods_type AS goodsType,
 			 d.goods_name AS goodsName,
 			 d.goods_price AS goodsPrice,
+			 '3年' AS subscriptionDate,
 			 d.sale_num AS saleNum,
 			 d.amount
     FROM t_goods_order_detail d LEFT JOIN t_goods_info g ON d.fk_goods_guid=g.guid
     WHERE d.fk_order_guid=#{orderGuid}
   </select>
+    <select id="findByGoodsOrderDetailByOrderId"
+            resultType="com.hcloud.microserver.system.facade.carbon.entity.GoodsOrderInfoDetailBo">
+    SELECT
+	a.guid AS guid,
+	-- 	a.fk_order_guid AS fkOrderGuid,
+	-- 	a.fk_goods_guid AS fkGoodsGuid,
+	a.goods_name AS goodsName,
+	a.goods_price AS goodsPrice,
+	a.sale_num AS saleNum,
+	a.amount AS amount,
+	-- 	a.state AS state,
+	--  	a.create_user AS createUser,
+	-- 	a.create_time AS createTime,
+	b.goods_code AS goodsCode,
+	b.goods_sale_date AS goodsSaleDate,
+	e.type_name AS typeName
+FROM
+	t_goods_order_detail a
+LEFT JOIN t_goods_info b ON a.fk_goods_guid = b.guid
+LEFT JOIN t_goods_detail c ON c.fk_goods_guid = a.fk_goods_guid
+LEFT JOIN t_product_info d ON c.fk_product_guid = d.guid
+LEFT JOIN t_product_type e ON d.fk_product_type = e.guid
+WHERE
+	a.fk_order_guid =  #{orderGuid}
+  </select>
 </mapper>

carbon-back/carbon-back-service/src/main/resources/carbon/GoodsOrderInfoMapper.xml

@@ -62,6 +62,7 @@
       ELSE
           '已作废'
       END AS orderStatus,
+       aa.order_status as statusNum,
        aa.create_time AS createTime,
        dd.credential_no AS credentialNo
       FROM
@@ -76,10 +77,10 @@
       AND dd.state = 1
       WHERE
          aa.state=1
-      <if test="data.beginDate!=null and data.beginDate!=''">
+      <if test="data.beginTime!=null and data.beginTime!=''">
         AND aa.create_time >= concat(#{data.beginDate},' 00:00:00')
       </if>
-      <if test="data.endDate!=null and data.endDate!=''">
+      <if test="data.endTime!=null and data.endTime!=''">
         <![CDATA[
         AND aa.create_time <= concat(#{data.endDate},' 23:59:59')
         ]]>
@@ -309,14 +310,14 @@
      where fk_customer_guid = #{oldId}
     </update>
     <!-- 线下认购订单列表 -->
-    <select id="offlineOrderList" parameterType="com.hcloud.microserver.commoncore.base.PageBean" resultType="com.hcloud.microserver.system.facade.carbon.entity.GoodsOrderInfo">
+    <select id="offlineOrderList" parameterType="com.hcloud.microserver.commoncore.base.PageBean" resultType="com.hcloud.microserver.system.bank.bo.OfflineOrderBO">
         SELECT 	o.guid,
         o.order_no AS orderNo,
         o.order_amount AS orderAmount,
         o.order_carbon_amount AS orderCarbonAmount,
         o.create_time AS createTime,
         CASE o.order_type
-        WHEN 1 THEN
+        WHEN 0 THEN
         '线上订单'
         WHEN 1 THEN
         '认购订单'
@@ -335,15 +336,17 @@
         ELSE
         '等待再审核'
         END AS orderStatus,
-        c.guid AS customerId
+        o.order_status AS status,
+        c.guid AS customerId,
         c.account,
-        c.customer_name AS customerName,
+        cc.company_name AS customerName,
         gc.guid AS credentialNo
         FROM t_goods_order_info o LEFT JOIN t_customer_info c ON o.fk_customer_guid = c.guid
+        LEFT JOIN t_customer_company_info cc ON c.guid=cc.fk_customer_id
         LEFT JOIN t_goods_credential_info gc ON gc.fk_order_id = o.guid
         WHERE o.state=1 AND order_type!=0
         <if test="data.customerName!=null and data.customerName!=''">
-            AND c.customer_name LIKE concat('%', #{data.customerName}, '%')
+            AND cc.company_name LIKE concat('%', #{data.customerName}, '%')
         </if>
         <if test="data.account!=null and data.account!=''">
             AND c.account=#{data.account}
@@ -352,19 +355,19 @@
             AND o.order_no=#{data.orderNo}
         </if>
         <if test="data.orderStatus !=null and data.orderStatus != ''">
-            AND o.order_status=#{data.orderStatus};
+            AND o.order_status=#{data.orderStatus}
         </if>
         ORDER BY o.create_time DESC
     </select>
     <!-- 查询线下认购订单详情-->
-    <select id="queryOfflineOrderDetial" parameterType="String" resultType="com.hcloud.microserver.system.facade.carbon.entity.GoodsOrderInfo">
+    <select id="queryOfflineOrderDetial" parameterType="String" resultType="com.hcloud.microserver.system.bank.bo.OfflineOrderDetailBO">
         SELECT 	o.guid,
 				o.order_no AS orderNo,
 				o.order_amount AS orderAmount,
 				o.order_carbon_amount AS orderCarbonAmount,
 				o.create_time AS createTime,
 				CASE o.order_type
-				WHEN 1 THEN
+				WHEN 0 THEN
 						'线上订单'
 				WHEN 1 THEN
 						'认购订单'
@@ -383,6 +386,7 @@
 				ELSE
 						'等待再审核'
 				END AS orderStatus,
+				o.order_status AS status,
 			  CASE p.pay_channel
 				WHEN 1 THEN
 						'微信支付'
@@ -409,4 +413,23 @@
 									  LEFT JOIN t_goods_pay_order p ON p.fk_order_id = o.guid
 					WHERE o.guid= #{guid}
     </select>
+    <select id="searchCredentialInfo" resultType="com.hcloud.microserver.system.bank.bo.CredentialInfoBO">
+        SELECT
+            DATE_FORMAT(aa.buy_date,'%Y年%m月%d日') AS buyDate,
+            aa.carbon_amount AS carbonAmount,
+            aa.credential_no AS credentialNo,
+            bb.customer_name AS customerName,
+            bb.nick_name AS nickName,
+            cc.company_name AS companyName,
+            dd.order_amount AS OrderAmount,
+            aa.farmer_names AS farmerName,
+            YEAR(aa.buy_date) AS year
+        FROM
+            t_goods_credential_info aa
+        LEFT JOIN t_goods_order_info dd ON aa.fk_order_id = dd.guid
+        LEFT JOIN t_customer_info bb ON aa.fk_customer_id = bb.guid
+        LEFT JOIN t_customer_company_info cc ON cc.fk_customer_id = bb.guid
+        WHERE
+        aa.fk_order_id = #{guid}
+    </select>
 </mapper>

carbon-back/carbon-back-service/src/main/resources/carbon/SubscriptionApplyMapper.xml

@@ -25,6 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectSubscriptionApplyList" parameterType="SubscriptionApply" resultMap="SubscriptionApplyResult">
         <include refid="selectSubscriptionApplyVo"/>
         <where>
+            record_status = 1
             <if test="applyCustomName != null  and applyCustomName != ''"> and apply_custom_name like concat('%', #{applyCustomName}, '%')</if>
             <if test="applyStatus != null "> and apply_status = #{applyStatus}</if>
             <if test="applyDate != null "> and apply_date = #{applyDate}</if>

carbon-h5/carbon-h5-common/carbon-h5-common.iml

@@ -0,0 +1,212 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="Spring" name="Spring">
+      <configuration />
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-starter:1.2.10" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.1.13.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.1.13.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.1.13.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.1.13.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.11.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.11.2" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.30" level="project" />
+    <orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.yaml:snakeyaml:1.23" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:1.3.2" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:1.3.2" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.4.6" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.3.2" level="project" />
+    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-autoconfigure:1.2.10" level="project" />
+    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.1.8" level="project" />
+    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:1.2" level="project" />
+    <orderEntry type="module" module-name="common-core" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.6.0" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.6.0" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.10" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-core:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:guava:25.1-jre" level="project" />
+    <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
+    <orderEntry type="library" name="Maven: org.checkerframework:checker-qual:2.0.0" level="project" />
+    <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.1.3" level="project" />
+    <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.1" level="project" />
+    <orderEntry type="library" name="Maven: org.codehaus.mojo:animal-sniffer-annotations:1.14" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.4.0" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.mapstruct:mapstruct:1.2.0.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-ui:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.1.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.1.14.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.12" level="project" />
+    <orderEntry type="library" name="Maven: io.jsonwebtoken:jjwt:0.9.0" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.10.3" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.10" level="project" />
+    <orderEntry type="library" name="Maven: cn.hutool:hutool-all:4.5.7" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.1.13.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.2.0" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.1.14.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.aliyun:aliyun-java-sdk-core:4.0.3" level="project" />
+    <orderEntry type="library" name="Maven: javax.xml.bind:jaxb-api:2.3.1" level="project" />
+    <orderEntry type="library" name="Maven: javax.activation:javax.activation-api:1.2.0" level="project" />
+    <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-core:2.1.14" level="project" />
+    <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-impl:2.1" level="project" />
+    <orderEntry type="library" name="Maven: javax.activation:activation:1.1.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-web:5.1.14.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.73" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-core:5.1.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.1.14.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.1.14.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: commons-net:commons-net:3.6" level="project" />
+    <orderEntry type="library" name="Maven: net.sf.dozer:dozer:5.5.1" level="project" />
+    <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.1" level="project" />
+    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.8.1" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.30" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.11" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" />
+    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.11" level="project" />
+    <orderEntry type="library" name="Maven: cn.hutool:hutool-captcha:5.5.0" level="project" />
+    <orderEntry type="library" name="Maven: cn.hutool:hutool-core:5.5.0" level="project" />
+    <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.6" level="project" />
+    <orderEntry type="library" name="Maven: com.google.zxing:core:3.3.3" level="project" />
+    <orderEntry type="library" name="Maven: com.google.zxing:javase:3.4.0" level="project" />
+    <orderEntry type="library" name="Maven: com.beust:jcommander:1.72" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.github.jai-imageio:jai-imageio-core:1.4.0" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:easyexcel:2.2.6" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi:3.17" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:3.17" level="project" />
+    <orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.04" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:3.17" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:2.6.0" level="project" />
+    <orderEntry type="library" name="Maven: stax:stax-api:1.0.1" level="project" />
+    <orderEntry type="library" name="Maven: cglib:cglib:3.1" level="project" />
+    <orderEntry type="library" name="Maven: org.ow2.asm:asm:4.2" level="project" />
+    <orderEntry type="library" name="Maven: org.ehcache:ehcache:3.6.3" level="project" />
+    <orderEntry type="library" name="Maven: com.jcraft:jsch:0.1.54" level="project" />
+    <orderEntry type="library" name="Maven: com.github.suxingli:aliyuncs:1.0.1" level="project" />
+    <orderEntry type="library" name="Maven: org.dom4j:dom4j:2.1.1" level="project" />
+    <orderEntry type="library" name="Maven: net.sf.json-lib:json-lib:jdk15:2.4" level="project" />
+    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.5" level="project" />
+    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
+    <orderEntry type="library" name="Maven: net.sf.ezmorph:ezmorph:1.0.6" level="project" />
+    <orderEntry type="library" name="Maven: com.belerweb:pinyin4j:2.5.1" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:log4j-over-slf4j:1.7.30" level="project" />
+    <orderEntry type="library" name="Maven: com.github.binarywang:weixin-java-mp:3.9.9.B" level="project" />
+    <orderEntry type="library" name="Maven: com.github.binarywang:weixin-java-common:3.9.9.B" level="project" />
+    <orderEntry type="library" name="Maven: com.thoughtworks.xstream:xstream:1.4.10" level="project" />
+    <orderEntry type="library" name="Maven: xmlpull:xmlpull:1.1.3.1" level="project" />
+    <orderEntry type="library" name="Maven: xpp3:xpp3_min:1.1.4c" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.5.11" level="project" />
+    <orderEntry type="library" name="Maven: commons-io:commons-io:2.5" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.1.16.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.1.16.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.1.14.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.1.14.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.1.14.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.jsoup:jsoup:1.12.1" level="project" />
+    <orderEntry type="library" name="Maven: net.sourceforge.jexcelapi:jxl:2.6.12" level="project" />
+    <orderEntry type="library" name="Maven: log4j:log4j:1.2.14" level="project" />
+    <orderEntry type="library" name="Maven: com.squareup.okhttp:okhttp:2.7.5" level="project" />
+    <orderEntry type="library" name="Maven: com.squareup.okio:okio:1.6.0" level="project" />
+    <orderEntry type="library" name="Maven: javax.validation:validation-api:2.0.1.Final" level="project" />
+    <orderEntry type="library" name="Maven: com.qiniu:qiniu-java-sdk:7.2.28" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.squareup.okhttp3:okhttp:3.8.1" level="project" />
+    <orderEntry type="library" name="Maven: com.github.anji-plus:captcha-spring-boot-starter:1.2.4" level="project" />
+    <orderEntry type="library" name="Maven: com.github.anji-plus:captcha:1.2.4" level="project" />
+    <orderEntry type="library" name="Maven: com.google.auto.service:auto-service:1.0-rc7" level="project" />
+    <orderEntry type="library" name="Maven: com.google.auto.service:auto-service-annotations:1.0-rc7" level="project" />
+    <orderEntry type="library" name="Maven: com.google.auto:auto-common:0.10" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-openfeign:2.1.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter:2.1.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-context:2.1.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-rsa:1.0.7.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.60" level="project" />
+    <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.60" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-openfeign-core:2.1.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form-spring:3.5.0" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form:3.5.0" level="project" />
+    <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.3.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-commons:2.1.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-crypto:5.1.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign:feign-core:10.1.0" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign:feign-slf4j:10.1.0" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign:feign-hystrix:10.1.0" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.archaius:archaius-core:0.7.6" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-hystrix:2.1.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-hystrix:2.1.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-ribbon:2.1.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-archaius:2.1.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-archaius:2.1.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: commons-configuration:commons-configuration:1.8" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-core:1.5.18" level="project" />
+    <orderEntry type="library" name="Maven: io.reactivex:rxjava:1.3.8" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-serialization:1.5.18" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.fasterxml.jackson.module:jackson-module-afterburner:2.9.10" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-metrics-event-stream:1.5.18" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-javanica:1.5.18" level="project" />
+    <orderEntry type="library" name="Maven: io.reactivex:rxjava-reactive-streams:1.2.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.reactivestreams:reactive-streams:1.0.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-actuator:2.1.13.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-actuator-autoconfigure:2.1.13.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-actuator:2.1.13.RELEASE" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.9.10" level="project" />
+    <orderEntry type="library" name="Maven: io.micrometer:micrometer-core:1.1.10" level="project" />
+    <orderEntry type="library" name="Maven: org.hdrhistogram:HdrHistogram:2.1.9" level="project" />
+    <orderEntry type="library" name="Maven: org.latencyutils:LatencyUtils:2.0.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.1.13.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.1.14.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.5" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.1.13.RELEASE" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.1.13.RELEASE" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.1.13.RELEASE" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.jayway.jsonpath:json-path:2.4.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: net.minidev:json-smart:2.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: net.minidev:accessors-smart:1.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:3.11.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:2.23.4" level="project" />
+    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.9.16" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy-agent:1.9.16" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:2.6" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.1.14.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.1.14.RELEASE" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:5.1.14.RELEASE" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.6.3" level="project" />
+    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-spring-boot-starter:2.0.4" level="project" />
+    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-spring-boot-autoconfigure:2.0.4" level="project" />
+    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-spring:2.0.4" level="project" />
+    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-annotations:2.0.4" level="project" />
+    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-core:2.0.4" level="project" />
+    <orderEntry type="library" name="Maven: org.javassist:javassist:3.25.0-GA" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-bean-validators:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-spring-ui:2.0.4" level="project" />
+    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-micro-spring-boot-starter:2.0.4" level="project" />
+  </component>
+</module>

common-core/src/main/java/com/hcloud/microserver/commoncore/util/reflect/DateUtils.java

@@ -216,4 +216,9 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
         todayEnd.set(Calendar.SECOND, 59);
         return todayEnd.getTime();
     }
+
+//    public static void main(String[] args) {
+//        Date payTime = DateUtils.dateTime(DateUtils.YYYY_MM_DD,"2020-12-01");
+//        System.out.println(payTime);
+//    }
 }

sql/表结构变化语句/更新sql.sql

@@ -103,3 +103,6 @@ CREATE TABLE `t_order_setting` (
 -- Records of t_order_setting
 -- ----------------------------
 INSERT INTO `t_order_setting` VALUES ('1', '1');
+
+# 企业表新增企业类型字段
+ALTER TABLE `t_customer_company_info` ADD COLUMN `company_type` VARCHAR (32) DEFAULT NULL COMMENT '企业类型' AFTER `fk_customer_id`;