认购申请,订单管理调试完成

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 {
 
     /**

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/OrderInfoController.java

@@ -4,6 +4,7 @@ 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.OfflineOrderBO;
 import com.hcloud.microserver.system.bank.bo.OfflineOrderDetailBO;
 import com.hcloud.microserver.system.bank.bo.OrderInfoBO;
 import com.hcloud.microserver.system.bank.service.OrderInfoService;
@@ -61,7 +62,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/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/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/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());
 

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/CustomerInfoMapper.xml

@@ -398,4 +398,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

@@ -200,6 +200,7 @@
 			 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

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

@@ -309,14 +309,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 +335,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 +354,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 +385,7 @@
 				ELSE
 						'等待再审核'
 				END AS orderStatus,
+				o.order_status AS status,
 			  CASE p.pay_channel
 				WHEN 1 THEN
 						'微信支付'

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,208 @@
+<?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.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: 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="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: 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: 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:spring-web:5.1.14.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.1.14.RELEASE" 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: org.slf4j:slf4j-api:1.7.30" 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: com.google.code.findbugs:jsr305:3.0.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: commons-configuration:commons-configuration:1.8" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.10" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.10" 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="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: 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: 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.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.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: 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: 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.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);
+//    }
 }