订单收款功能、认购申请订单里新加orderGuid字段

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

@@ -54,6 +54,9 @@ public class SubscriptionApply extends BaseEntity
     @ApiModelProperty(value = "申请时间")
     private String applyDate;
 
+    @ApiModelProperty(value = "订单id")
+    private String orderGuid;
+
     /** 修改时间  */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "修改时间 ", width = 30, dateFormat = "yyyy-MM-dd")
@@ -133,6 +136,14 @@ public class SubscriptionApply extends BaseEntity
         return modifiedTime;
     }
 
+    public String getOrderGuid() {
+        return orderGuid;
+    }
+
+    public void setOrderGuid(String orderGuid) {
+        this.orderGuid = orderGuid;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

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

@@ -0,0 +1,34 @@
+package com.hcloud.microserver.system.facade.carbon.forms;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @Author liql
+ * @Date 2020-11-30
+ */
+@Data
+@ApiModel("离线订单支付凭证")
+public class OfflineOrderPayVoucherForm implements Serializable {
+    @ApiModelProperty("订单id")
+    private String orderId;
+    @ApiModelProperty("客户id")
+    private String customerId;
+    @ApiModelProperty("付款人姓名")
+    private String payUserName;
+    @ApiModelProperty("付款银行")
+    private String payBank;
+    @ApiModelProperty("付款银行卡号")
+    private String payCardNo;
+    @ApiModelProperty("付款金额")
+    private BigDecimal payAmount;
+    @ApiModelProperty("付款时间")
+    private String payTime;
+    @ApiModelProperty("转账凭证图片地址;分隔")
+    private String voucherImages;
+}

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

@@ -1,13 +1,15 @@
 package com.hcloud.microserver.system.facade.carbon.forms;
 
 import com.hcloud.microserver.commoncore.base.BaseForm;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
 import java.util.Date;
 
 /**
- * @author xiezt
+ *
  */
 @Data
 public class OrderPayVoucherForm extends BaseForm {

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

@@ -29,7 +29,6 @@ public class CarbonSystemApplication
     public static void main(String[] args)
     {
         SpringApplication.run(CarbonSystemApplication.class, args);
-        System.out.println("---------------------h5启动成功!---------------------");
-        System.out.println("CarbonSystemApplication 启动完成！");
+        System.out.println("---------------------后台启动成功!---------------------");
     }
 }

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

@@ -1,5 +1,7 @@
 package com.hcloud.microserver.system.bank.bo;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -9,14 +11,22 @@ import java.math.BigDecimal;
  * @Date 2020-11-29
  */
 @Data
+@ApiModel("创建订单信息实体")
 public class CreateOrderBO {
+    @ApiModelProperty(value = "线下认购申请id",required = true)
+    private String guid;
+    @ApiModelProperty(value = "购买碳汇数量",required = true)
     private BigDecimal orderCarbonAmount;
+    @ApiModelProperty(value = "订单类型：1认购订单，2后台订单",required = true)
     private Integer orderType;
+    @ApiModelProperty(value = "客户id",required = true)
     private String applyCostomerId;
+    @ApiModelProperty(value = "产品类型id",required = true)
     private String productTypeGuid;
     private String provinceId;
     private String cityId;
     private String countyId;
     private String townId;
+    @ApiModelProperty(value = "村庄id",required = true)
     private String villageId;
 }

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

@@ -27,9 +27,10 @@ public class OfflineOrderBO {
      */
     @ApiModelProperty("订单编号")
     private String orderNo;
-    /**
-     * 客户账号
-     */
+
+    @ApiModelProperty("客户id")
+    private String customerId;
+
     @ApiModelProperty("客户账号")
     private String account;
     /**

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

@@ -12,6 +12,7 @@ import com.hcloud.microserver.commoncore.base.ResponseBase;
 import com.hcloud.microserver.system.facade.carbon.forms.GoodsInfoForm;
 import com.hcloud.microserver.system.facade.carbon.forms.GoodsOrderInfoForm;
 import com.hcloud.microserver.system.facade.carbon.forms.OfflineOrderCondidtionForm;
+import com.hcloud.microserver.system.facade.carbon.forms.OfflineOrderPayVoucherForm;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -59,22 +60,13 @@ public class OrderInfoController extends BaseController {
      */
 
     @ApiOperation("查询线下订单列表")
-    @GetMapping("/offline_order_list")
+    @GetMapping("/offline-order-list")
     public ResponseBase<OrderInfoBO> queryOfflineOrderList(@RequestBody OfflineOrderCondidtionForm condidtionForm) {
         PageInfo pageInfo = orderInfoService.offlineOrderList(condidtionForm);
         return responseSuccess(pageInfo);
     }
 
 
-    /**
-     * 确认收款：
-     *  1、将订单状态改为已收款
-     *  2、生成证书
-     */
-
-
-
-
     /**
      * 订单详情：
      *  1、根据订单号查询主订单信息
@@ -82,11 +74,30 @@ public class OrderInfoController extends BaseController {
      */
 
     @ApiOperation("查询线下订单详情")
-    @GetMapping("/offline_order_detail")
+    @GetMapping("/offline-order-detail")
     public ResponseBase<OfflineOrderDetailBO> queryOrderDetail(String guid) {
         OfflineOrderDetailBO order = orderInfoService.queryOfflineOrderDetial(guid);
         ResultVO result =new ResultVO(ResultEnum.SUCCESS,order);
         return responseSuccess(result);
     }
 
+
+    /**
+     * 确认收款：
+     *  1、将订单状态改为已收款
+     *  2、保存收款凭证
+     *  3、生成证书
+     */
+
+    @ApiOperation("收款")
+    @PutMapping("/collect-money")
+    public ResponseBase collectMoney(@RequestBody OfflineOrderPayVoucherForm payVoucher) {
+        int success = this.orderInfoService.collectMoneyDeal(payVoucher);
+        if (success>0){
+            return responseResultSuccess();
+        }
+        return responseResultFailure();
+    }
+
+
 }

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

@@ -61,9 +61,9 @@ public class SubscriptionApplyController extends BaseController
     @PutMapping
     @AuthCarbonValidate
     @ApiOperation("更新申请状态为认购成功")
-    public AjaxResult edit(String guid)
+    public AjaxResult edit(String guid,String orderGuid)
     {
-        return toAjax(subscriptionApplyService.updateSubscriptionApply(guid));
+        return toAjax(subscriptionApplyService.updateSubscriptionApply(guid,orderGuid));
     }
 
     /**

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

@@ -1,6 +1,7 @@
 package com.hcloud.microserver.system.bank.dao;
 
 import com.hcloud.microserver.system.facade.carbon.entity.SubscriptionApply;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -35,7 +36,7 @@ public interface SubscriptionApplyMapper
      * @param guid 碳汇认购申请
      * @return 结果
      */
-    public int updateSubscriptionApply(String guid);
+    public int updateSubscriptionApply(@Param("guid") String guid,@Param("orderGuid") String orderGuid);
 
     /**
      * 删除碳汇认购申请

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

@@ -36,7 +36,7 @@ public interface ISubscriptionApplyService
      * @param guid 碳汇认购申请
      * @return 结果
      */
-    public int updateSubscriptionApply(String guid);
+    public int updateSubscriptionApply(String guid,String orderGuid);
 
     /**
      * 批量删除碳汇认购申请

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

@@ -7,6 +7,7 @@ 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;
 import com.hcloud.microserver.system.facade.carbon.forms.OfflineOrderCondidtionForm;
+import com.hcloud.microserver.system.facade.carbon.forms.OfflineOrderPayVoucherForm;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -102,4 +103,11 @@ public interface OrderInfoService extends BaseServie<GoodsOrderInfoForm,String>
      */
     OfflineOrderDetailBO queryOfflineOrderDetial(@Param("guid") String guid);
 
+    /**
+     * 收款处理
+     * @param payVoucher
+     * @return
+     */
+    int collectMoneyDeal(OfflineOrderPayVoucherForm payVoucher);
+
 }

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

@@ -2,6 +2,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.facade.carbon.forms.OfflineOrderPayVoucherForm;
 import com.hcloud.microserver.system.facade.carbon.forms.OrderPayVoucherForm;
 
 import java.util.List;
@@ -30,4 +31,11 @@ public interface OrderPayVoucherService extends BaseServie<OrderPayVoucherForm,S
      * @return
      */
     PageInfo queryListByPage(OrderPayVoucherForm orderPayVoucherForm);
+
+    /**
+     * 生成离线支付凭证信息
+     * @param payVoucher
+     * @return
+     */
+    int newSavePayVoucher(OfflineOrderPayVoucherForm payVoucher);
 }

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/bank/service/impl/OrderInfoServiceImpl.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.commoncore.util.UUIDUtils;
 import com.hcloud.microserver.security.util.SecurityUtils;
 import com.hcloud.microserver.system.bank.bo.*;
 import com.hcloud.microserver.system.bank.dao.*;
@@ -40,6 +41,10 @@ public class OrderInfoServiceImpl implements OrderInfoService {
     private GoodsOrderDetailMapper goodsOrderDetailMapper;
     @Resource
     private GoodsSaleInfoMapper goodsSaleInfoMapper;
+    @Resource
+    private SubscriptionApplyMapper subscriptionApplyMapper;
+    @Autowired
+    private OrderPayVoucherService orderPayVoucherService;
     @Autowired
     private OrderPayApplyService orderPayApplyService;
     @Autowired
@@ -463,6 +468,9 @@ public class OrderInfoServiceImpl implements OrderInfoService {
         //保存
         int saveOrderResult =  goodsOrderInfoMapper.insertSelective(order);
 
+        //更新申请表
+        subscriptionApplyMapper.updateSubscriptionApply(createOrderBO.getGuid(),order.getOrderNo());
+
         return saveOrderResult;
     }
 
@@ -496,6 +504,31 @@ public class OrderInfoServiceImpl implements OrderInfoService {
         return order;
     }
 
+    /**
+     * 收款处理
+     *
+     * @param payVoucher
+     * @return
+     */
+    @Override
+    @Transactional
+    public int collectMoneyDeal(OfflineOrderPayVoucherForm payVoucher) {
+        //更新订单状态
+        String payNo = UUIDUtils.randomUUID();
+        GoodsOrderInfo order = new GoodsOrderInfo();
+        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());
+        goodsOrderInfoMapper.updateByPrimaryKeySelective(order);
+        //保存收款凭证
+        int result = orderPayVoucherService.newSavePayVoucher(payVoucher);
+        //保存证书 TODO
+        return result;
+    }
+
     @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

@@ -3,6 +3,7 @@ package com.hcloud.microserver.system.bank.service.impl;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.hcloud.microserver.commoncore.util.reflect.DateUtils;
 import com.hcloud.microserver.system.bank.dao.GoodsOrderInfoMapper;
 import com.hcloud.microserver.system.bank.dao.OrderPayVoucherMapper;
 import com.hcloud.microserver.system.bank.events.CredentialInfoEvent;
@@ -11,6 +12,7 @@ import com.hcloud.microserver.commoncore.util.BeanCopyUtil;
 import com.hcloud.microserver.commoncore.util.GetUUID;
 import com.hcloud.microserver.system.facade.carbon.entity.GoodsOrderInfo;
 import com.hcloud.microserver.system.facade.carbon.entity.OrderPayVoucher;
+import com.hcloud.microserver.system.facade.carbon.forms.OfflineOrderPayVoucherForm;
 import com.hcloud.microserver.system.facade.carbon.forms.OrderPayVoucherForm;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
@@ -138,4 +140,31 @@ public class OrderPayVoucherServiceImpl implements OrderPayVoucherService {
         OrderPayVoucher orderPayVoucher = BeanCopyUtil.convertBean(record,OrderPayVoucher.class);
         return orderPayVoucherMapper.updateByPrimaryKey(orderPayVoucher);
     }
+
+    /**
+     * 生成离线支付凭证信息
+     *
+     * @param payVoucher
+     * @return
+     */
+    @Override
+    @Transactional
+    public int newSavePayVoucher(OfflineOrderPayVoucherForm payVoucher) {
+        OrderPayVoucher record = new OrderPayVoucher();
+        record.setGuid(GetUUID.getUUID());
+        record.setCreateTime(new Date());
+        record.setModifiedTime(new Date());
+        record.setState(1);
+
+        record.setFkOrderId(payVoucher.getOrderId());
+        record.setFkCustomerId(payVoucher.getCustomerId());
+        record.setPayAmount(payVoucher.getPayAmount());
+        record.setPayBank(payVoucher.getPayBank());
+        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());
+        record.setPayTime(payTime);
+        return orderPayVoucherMapper.insertSelective(record);
+    }
 }

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

@@ -54,9 +54,9 @@ public class SubscriptionApplyServiceImpl implements ISubscriptionApplyService
      * @return 结果
      */
     @Override
-    public int updateSubscriptionApply(String guid)
+    public int updateSubscriptionApply(String guid,String orderGuid)
     {
-        return subscriptionApplyMapper.updateSubscriptionApply(guid);
+        return subscriptionApplyMapper.updateSubscriptionApply(guid,orderGuid);
     }
 
     /**

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

@@ -335,6 +335,7 @@
         ELSE
         '等待再审核'
         END AS orderStatus,
+        c.guid AS customerId
         c.account,
         c.customer_name AS customerName,
         gc.guid AS credentialNo

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

@@ -1,6 +1,6 @@
 <?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="OrderPayVoucherMapper">
+<mapper namespace="com.hcloud.microserver.system.bank.dao.OrderPayVoucherMapper">
     <resultMap id="BaseResultMap" type="OrderPayVoucher">
         <id column="guid" jdbcType="CHAR" property="guid"/>
         <result column="fk_order_id" jdbcType="CHAR" property="fkOrderId"/>

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

@@ -12,13 +12,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="remark"             column="remark"    />
         <result property="applyStatus"        column="apply_status"    />
         <result property="recordStatus"       column="record_status"    />
+        <result property="orderGuid"            column="order_guid"    />
         <result property="applyDate"          column="apply_date"    />
         <result property="createTime"         column="create_time"    />
         <result property="modifiedTime"       column="modified_time"    />
     </resultMap>
 
     <sql id="selectSubscriptionApplyVo">
-        select guid, apply_customer_id, apply_custom_name, amount, remark, apply_status, record_status, apply_date, create_time, modified_time from t_subscription_apply
+        select guid, apply_customer_id, apply_custom_name, amount, remark, apply_status, record_status,order_guid,apply_date, create_time, modified_time from t_subscription_apply
     </sql>
 
     <select id="selectSubscriptionApplyList" parameterType="SubscriptionApply" resultMap="SubscriptionApplyResult">
@@ -28,6 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="applyStatus != null "> and apply_status = #{applyStatus}</if>
             <if test="applyDate != null "> and apply_date = #{applyDate}</if>
         </where>
+        ORDER BY create_time DESC
     </select>
     
     <select id="selectSubscriptionApplyById" parameterType="String" resultMap="SubscriptionApplyResult">
@@ -39,6 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateSubscriptionApply" parameterType="SubscriptionApply">
         update t_subscription_apply
         <trim prefix="SET" suffixOverrides=",">
+            <if test="orderGuid != null ">order_guid = #{orderGuid},</if>
             <if test="applyStatus != null ">apply_status = #{applyStatus},</if>
             <if test="modifiedTime != null ">modified_time = #{modifiedTime},</if>
         </trim>

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/h5/entity/SubscriptionApply.java

@@ -48,6 +48,10 @@ public class SubscriptionApply extends BaseEntity
     @ApiModelProperty(value = "记录状态(0无效，1有效)")
     private Integer recordStatus;
 
+    @Excel(name = "订单号")
+    @ApiModelProperty(value = "订单号")
+    private String orderGuid;
+
     /** 申请时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "申请时间", width = 30, dateFormat = "yyyy-MM-dd")
@@ -114,6 +118,14 @@ public class SubscriptionApply extends BaseEntity
         return recordStatus;
     }
 
+    public String getOrderGuid() {
+        return orderGuid;
+    }
+
+    public void setOrderGuid(String orderGuid) {
+        this.orderGuid = orderGuid;
+    }
+
     public String getApplyDate() {
         return applyDate;
     }

carbon-h5/carbon-h5-service/src/main/resources/com/hcloud/microserver/h5/dao/SubscriptionApplyMapper.xml

@@ -12,13 +12,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="remark"             column="remark"    />
         <result property="applyStatus"        column="apply_status"    />
         <result property="recordStatus"       column="record_status"    />
+        <result property="orderGuid"            column="order_guid"    />
         <result property="applyDate"          column="apply_date"    />
         <result property="createTime"         column="create_time"    />
         <result property="modifiedTime"       column="modified_time"    />
     </resultMap>
 
     <sql id="selectSubscriptionApplyVo">
-        select guid, apply_customer_id, apply_custom_name, amount, remark, apply_status, record_status, apply_date, create_time, modified_time from t_subscription_apply
+        select guid, apply_customer_id, apply_custom_name, amount, remark, apply_status, record_status,order_guid,apply_date, create_time, modified_time from t_subscription_apply
     </sql>
 
     <select id="selectSubscriptionApplyList" parameterType="LONG" resultMap="SubscriptionApplyResult">
@@ -26,6 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <if test="applyCustomerId != null "> and apply_customer_id = #{applyCustomerId}</if>
         </where>
+        ORDER BY create_time DESC
     </select>
     
     <select id="selectSubscriptionApplyById" parameterType="String" resultMap="SubscriptionApplyResult">
@@ -65,6 +67,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateSubscriptionApply" parameterType="SubscriptionApply">
         update t_subscription_apply
         <trim prefix="SET" suffixOverrides=",">
+            <if test="orderGuid != null ">order_guid = #{orderGuid},</if>
             <if test="applyStatus != null ">apply_status = #{applyStatus},</if>
             <if test="modifiedTime != null ">modified_time = #{modifiedTime},</if>
         </trim>