Merge branch 'develop'

kustomization/overlays/dev/kustomization.yaml

@@ -14,4 +14,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/oms
-  newTag: b7b6292e8a4fd03a5ea0c9ad7cb8d3079ed995ad
+  newTag: 1a194fd7d926274c664924e84d1ca181726cd9b9

src/main/java/com/mmc/oms/common/util/CodeUtil.java

@@ -261,7 +261,7 @@ public class CodeUtil {
         Date now = new Date();
         String dateString = sdf.format(now);
         int count = counter.incrementAndGet();
-        return "ORD" + dateString + String.format("%04d", count);
+        return "L" + dateString + String.format("%04d", count);
     }
 
 }

src/main/java/com/mmc/oms/controller/lease/LeaseOrderController.java

@@ -8,6 +8,7 @@ import com.mmc.oms.model.qo.uav.UavOrderQO;
 import com.mmc.oms.model.vo.lease.AddLeaseOrderVO;
 import com.mmc.oms.model.vo.lease.LeaseOrderRefundVO;
 import com.mmc.oms.model.vo.uav.UavOrderExpressVO;
+import com.mmc.oms.model.vo.uav.UavOrderRemarkVO;
 import com.mmc.oms.service.lease.LeaseOrderService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -81,14 +82,14 @@ public class LeaseOrderController extends BaseController {
 
     @ApiOperation(value = "用户收货")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
-    @GetMapping("receive")
-    public ResultBody receive(@RequestParam Integer id, HttpServletRequest request) {
-        return leaseOrderService.receive(id, this.getCurrentAccount(request));
+    @PostMapping("receive")
+    public ResultBody receive(@RequestBody LeaseOrderRefundVO leaseOrderRefundVO, HttpServletRequest request) {
+        return leaseOrderService.receive(leaseOrderRefundVO, this.getCurrentAccount(request));
     }
 
     @ApiOperation(value = "归还商品")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
-    @GetMapping("giveBack")
+    @PostMapping("giveBack")
     public ResultBody giveBack(@RequestBody LeaseOrderRefundVO leaseOrderRefundVO, HttpServletRequest request) {
         return leaseOrderService.giveBack(leaseOrderRefundVO, this.getCurrentAccount(request));
     }
@@ -114,4 +115,19 @@ public class LeaseOrderController extends BaseController {
         return leaseOrderService.removeLeaseOrder(id);
     }
 
+    @ApiOperation(value = "小程序确认结算")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
+    @GetMapping("confirmSettlement")
+    public ResultBody confirmSettlement(@RequestParam Integer id, HttpServletRequest request) {
+        return leaseOrderService.confirmSettlement(id, this.getCurrentAccount(request));
+    }
+
+    @ApiOperation(value = "评价订单")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
+    @PostMapping("remarkOrder")
+    public ResultBody remarkOrder(@RequestBody UavOrderRemarkVO uavOrderRemarkVO) {
+        return leaseOrderService.remarkOrder(uavOrderRemarkVO);
+    }
+
+
 }

src/main/java/com/mmc/oms/dao/lease/LeaseOrderDao.java

@@ -5,6 +5,7 @@ import com.mmc.oms.entity.lease.LeaseOrderExpressDO;
 import com.mmc.oms.entity.lease.LeaseRefundOrderDO;
 import com.mmc.oms.entity.transtatus.TranStatusDicDO;
 import com.mmc.oms.entity.uav.UavOrderDO;
+import com.mmc.oms.entity.uav.UavOrderRemarkDO;
 import com.mmc.oms.model.qo.uav.UavOrderQO;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -25,7 +26,7 @@ public interface LeaseOrderDao {
 
     LeaseOrderExpressDO getLeaseOrderExpress(Integer id);
 
-    void updateUavOrderStatus(Integer id, Integer code);
+    void updateLeaseOrderStatus(Integer id, Integer code);
 
     void addLeaseRefundOrder(LeaseRefundOrderDO leaseRefundOrderDO);
 
@@ -46,4 +47,10 @@ public interface LeaseOrderDao {
     List<LeaseOrderExpressDO> listLeaseOrderExpress(List<Integer> expressIds);
 
     void updateLeaseOrderProportion(Integer id, int proportion);
+
+    LeaseRefundOrderDO selectGiveBackByOrderId(Integer id, Integer type);
+
+    void updateLeaseOrderRemarkStatus(Integer id);
+
+    void addRemarkOrder(UavOrderRemarkDO uavOrderRemarkDO);
 }

src/main/java/com/mmc/oms/entity/lease/LeaseOrderDO.java

@@ -158,12 +158,16 @@ public class LeaseOrderDO implements Serializable {
 
     private BigDecimal salaryCashPledge;
 
+    private BigDecimal otherPledge;
+
     public LeaseOrderDTO buildLeaseOrderDTO() {
-        return LeaseOrderDTO.builder().id(id).orderNo(orderNo).statusCode(statusCode).userAccountId(userAccountId)
+        return LeaseOrderDTO.builder().id(id).orderNo(orderNo).orderName(orderName).statusCode(statusCode).userAccountId(userAccountId)
                 .thirdBackUserAccountId(thirdBackUserAccountId).companyName(companyName).orderTotalAmount(orderTotalAmount)
                 .salaryAmount(salaryAmount).shareAmount(shareAmount).otherAmount(otherAmount).payType(payType).payTime(payTime)
                 .startDate(startDate).endDate(endDate).userRemark(userRemark).sellerRemark(sellerRemark).createTime(createTime)
-                .confirmReceiptTime(confirmReceiptTime).remarkStatus(remarkStatus).modeOfDeliveryInfo(modeOfDeliveryInfo).sku(sku).skuImg(skuImg).build();
+                .confirmReceiptTime(confirmReceiptTime).remarkStatus(remarkStatus).modeOfDeliveryInfo(modeOfDeliveryInfo).depositBackTime(confirmReceiptTime)
+                .unitPrice(unitPrice).deposit(deposit).wareNum(wareNum).sku(sku).skuImg(skuImg).leaseGoodsId(leaseGoodsId).otherPledge(otherPledge)
+                .salaryCashPledge(salaryCashPledge).shareCashPledge(shareCashPledge).modeOfDeliveryInfo(modeOfDeliveryInfo).build();
     }
 }
 

src/main/java/com/mmc/oms/entity/lease/LeaseRefundOrderDO.java

@@ -7,6 +7,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -49,17 +50,20 @@ public class LeaseRefundOrderDO implements Serializable {
 
     private Integer type;
 
+    private BigDecimal modifiedDeposit;
+
     public LeaseRefundOrderDO(LeaseOrderRefundVO leaseOrderRefundVO) {
         this.leaseOrderId = leaseOrderRefundVO.getOrderId();
         this.status = leaseOrderRefundVO.getStatus();
         this.file = leaseOrderRefundVO.getFile();
         this.reason = leaseOrderRefundVO.getReason();
+        this.modifiedDeposit = leaseOrderRefundVO.getDeductionAmount();
     }
 
     public LeaseRefundOrderDTO buildLeaseRefundOrderDTO() {
         return LeaseRefundOrderDTO.builder().id(this.id).leaseOrderId(this.leaseOrderId)
                 .status(this.status).file(this.file).reason(this.reason)
-                .createTime(this.createTime).build();
+                .createTime(this.createTime).modifiedDeposit(modifiedDeposit).build();
     }
 }
 

src/main/java/com/mmc/oms/enums/LeaseOrderStatus.java

@@ -13,6 +13,8 @@ public enum LeaseOrderStatus {
     REMAIN_TO_BE_EVALUATED(600, "待评价", "待评价"),
     COMPLETE_TRANSACTION(700, "交易完成", "交易完成"),
     APPLY_REFUND(800, "申请退款", "退款中"),
+    MODIFIED_DEPOSIT_TO_BE_CONFIRMED(900, "待确认修改后押金", "待确认修改后押金"),
+    MODIFIED_DEPOSIT_REFUND(950, "待确认修改后押金", "待确认修改后押金"),
     CLOSE(999, "订单关闭", "订单关闭");
 
     public Integer getCode() {

src/main/java/com/mmc/oms/model/dto/lease/LeaseOrderDTO.java

@@ -29,6 +29,8 @@ public class LeaseOrderDTO implements Serializable {
     private Integer id;
     @ApiModelProperty("订单编号")
     private String orderNo;
+    @ApiModelProperty("订单名称")
+    private String orderName;
     @ApiModelProperty("订单状态")
     private Integer statusCode;
     @ApiModelProperty("买家id")
@@ -51,8 +53,14 @@ public class LeaseOrderDTO implements Serializable {
     private BigDecimal salaryAmount;
     @ApiModelProperty("抵扣云享金余额")
     private BigDecimal shareAmount;
+    @ApiModelProperty("云享金押金抵扣")
+    private BigDecimal shareCashPledge;
+    @ApiModelProperty("余额押金抵扣")
+    private BigDecimal salaryCashPledge;
     @ApiModelProperty("其他方式支付额度")
     private BigDecimal otherAmount;
+    @ApiModelProperty("其他方式支付额度")
+    private BigDecimal otherPledge;
     @ApiModelProperty("wechatpay微信，alipay支付宝，offline线下")
     private String payType;
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@@ -83,8 +91,20 @@ public class LeaseOrderDTO implements Serializable {
     private Date updateTime;
     @ApiModelProperty("用户收货地址信息")
     private UavOrderExpressDTO uavOrderExpressDTO;
-    @ApiModelProperty("快递信息")
+    @ApiModelProperty("发货快递信息")
     private KdnExpDTO kdnExpDTO;
+    @ApiModelProperty("归还快递信息")
+    private KdnExpDTO returnKdnExpDTO;
+    @ApiModelProperty("确认收货的信息")
+    private LeaseRefundOrderDTO confirmReceipt;
+    @ApiModelProperty("购买数量")
+    private Integer wareNum;
+    @ApiModelProperty(value = "单价", hidden = true)
+    private BigDecimal unitPrice;
+    @ApiModelProperty(value = "押金", hidden = true)
+    private BigDecimal deposit;
+    @ApiModelProperty("租赁商品id")
+    private Integer leaseGoodsId;
     @ApiModelProperty("订单规格列表")
     private String sku;
     @ApiModelProperty("sku图片")
@@ -93,6 +113,10 @@ public class LeaseOrderDTO implements Serializable {
     private String modeOfDeliveryInfo;
     @ApiModelProperty("发货后申请退款")
     private LeaseRefundOrderDTO leaseRefundOrder;
+    @ApiModelProperty("商户收货后上传的破损信息")
+    private LeaseRefundOrderDTO storeDamageOrder;
     @ApiModelProperty("商户确认收货信息")
     private LeaseRefundOrderDTO storeReceiveOrder;
+    @ApiModelProperty("押金退回时间")
+    private Date depositBackTime;
 }

src/main/java/com/mmc/oms/model/dto/lease/LeaseRefundOrderDTO.java

@@ -7,6 +7,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -33,6 +34,8 @@ public class LeaseRefundOrderDTO implements Serializable {
     private String file;
     @ApiModelProperty("退款原因")
     private String reason;
+    @ApiModelProperty("修改后的押金")
+    private BigDecimal modifiedDeposit;
     @ApiModelProperty("创建时间")
     private Date createTime;
 

src/main/java/com/mmc/oms/model/vo/lease/LeaseOrderRefundVO.java

@@ -6,6 +6,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 
 /**
  * @Author LW
@@ -32,4 +33,6 @@ public class LeaseOrderRefundVO implements Serializable {
     private String file;
     @ApiModelProperty("原因")
     private String reason;
+    @ApiModelProperty("扣除的押金")
+    private BigDecimal deductionAmount;
 }

src/main/java/com/mmc/oms/service/lease/LeaseOrderService.java

@@ -7,6 +7,7 @@ import com.mmc.oms.model.qo.uav.UavOrderQO;
 import com.mmc.oms.model.vo.lease.AddLeaseOrderVO;
 import com.mmc.oms.model.vo.lease.LeaseOrderRefundVO;
 import com.mmc.oms.model.vo.uav.UavOrderExpressVO;
+import com.mmc.oms.model.vo.uav.UavOrderRemarkVO;
 
 import javax.servlet.http.HttpServletRequest;
 
@@ -31,7 +32,7 @@ public interface LeaseOrderService {
 
     ResultBody send(UavOrderExpressVO param);
 
-    ResultBody receive(Integer id, BaseAccountDTO currentAccount);
+    ResultBody receive(LeaseOrderRefundVO leaseOrderRefundVO, BaseAccountDTO currentAccount);
 
     ResultBody statusList();
 
@@ -40,4 +41,8 @@ public interface LeaseOrderService {
     ResultBody giveBack(LeaseOrderRefundVO leaseOrderRefundVO, BaseAccountDTO currentAccount);
 
     ResultBody pfConfirmOrderWare(BaseAccountDTO currentAccount, LeaseOrderRefundVO param);
+
+    ResultBody confirmSettlement(Integer id, BaseAccountDTO currentAccount);
+
+    ResultBody remarkOrder(UavOrderRemarkVO uavOrderRemarkVO);
 }

src/main/resources/mapper/lease/LeaseOrderDao.xml

@@ -24,13 +24,15 @@
                                  start_date,
                                  share_cash_pledge,
                                  salary_cash_pledge,
+                                 other_pledge,
+                                 mode_of_delivery_Info,
                                  end_date,
                                  sku)
         values (#{orderNo}, #{statusCode}, #{userAccountId}, #{leaseGoodsId}, #{companyName}, #{thirdBackUserAccountId},
                 #{orderName}, #{skuImg}, #{orderTotalAmount}, #{salaryAmount}, #{shareAmount}, #{otherAmount},
                 #{userAddressId},
                 #{payTime}, #{userRemark}, #{unitPrice}, #{wareNum}, #{deposit}, #{startDate}, #{shareCashPledge},
-                #{salaryCashPledge}, #{endDate}, #{sku});
+                #{salaryCashPledge}, #{otherPledge}, #{modeOfDeliveryInfo}, #{endDate}, #{sku});
     </insert>
     <insert id="addAddress" keyProperty="id" useGeneratedKeys="true"
             parameterType="com.mmc.oms.entity.lease.LeaseOrderExpressDO">
@@ -41,10 +43,16 @@
     </insert>
     <insert id="addLeaseRefundOrder" parameterType="com.mmc.oms.entity.lease.LeaseRefundOrderDO" useGeneratedKeys="true"
             keyProperty="id">
-        insert into lease_refund_order(lease_order_id, status, file, reason, type, lease_order_express_id)
-        values (#{leaseOrderId}, #{status}, #{file}, #{reason}, #{type}, #{leaseOrderExpressId})
+        insert into lease_refund_order(lease_order_id, status, file, reason, type, lease_order_express_id,
+                                       modified_deposit)
+        values (#{leaseOrderId}, #{status}, #{file}, #{reason}, #{type}, #{leaseOrderExpressId}, #{modifiedDeposit})
     </insert>
-    <update id="updateUavOrderStatus">
+    <insert id="addRemarkOrder">
+        insert into uav_order_remark (remark_type, mall_goods_id, uav_order_id, remark_level, uav_images, content,
+                                      create_time)
+        values (#{remarkType}, #{mallGoodsId}, #{uavOrderId}, #{remarkLevel}, #{uavImages}, #{content}, NOW())
+    </insert>
+    <update id="updateLeaseOrderStatus">
         update lease_order
         set status_code = #{code}
         where id = #{id}
@@ -105,7 +113,13 @@
     </update>
     <update id="updateLeaseOrderProportion">
         update lease_order
-        set proportion = #{proportion}
+        set proportion           = #{proportion},
+            confirm_receipt_time = NOW()
+        where id = #{id}
+    </update>
+    <update id="updateLeaseOrderRemarkStatus">
+        update lease_order
+        set remark_status = 1
         where id = #{id}
     </update>
 
@@ -114,7 +128,8 @@
         ,order_no,status_code,user_account_id,lease_goods_id,company_name,third_back_user_account_id,
 order_name,sku_img,sku,order_total_amount,salary_amount,share_amount,other_amount,pay_type,
 user_address_id,user_remark,seller_remark,pay_time,confirm_receipt_time,version,remark_status,mode_of_delivery_Info,
-proportion,show_user_port,create_time,update_time,unit_price,ware_num,deposit,start_date,end_date,shut_reason,send_ware_time
+proportion,show_user_port,create_time,update_time,unit_price,ware_num,deposit,start_date,end_date,shut_reason,
+share_cash_pledge,salary_cash_pledge,other_pledge
     </sql>
 
     <select id="detail" resultType="com.mmc.oms.entity.lease.LeaseOrderDO">
@@ -138,7 +153,7 @@ proportion,show_user_port,create_time,update_time,unit_price,ware_num,deposit,st
         select count(*) from lease_order lo
         where 1 = 1
         <if test="keyword != null">
-            and order_no = #{keyword}
+            and (lo.order_no like CONCAT('%',#{keyword},'%') or lo.order_name like CONCAT('%',#{keyword},'%'))
         </if>
         <if test="userAccountId != null">
             and user_account_id = #{userAccountId}
@@ -167,7 +182,7 @@ proportion,show_user_port,create_time,update_time,unit_price,ware_num,deposit,st
         WHERE
         1 = 1
         <if test="keyword != null">
-            and lo.order_no = #{keyword}
+            and (lo.order_no like CONCAT('%',#{keyword},'%') or lo.order_name like CONCAT('%',#{keyword},'%'))
         </if>
         <if test="uid != null">
             and lo.user_account_id = #{uid}
@@ -190,12 +205,12 @@ proportion,show_user_port,create_time,update_time,unit_price,ware_num,deposit,st
         <if test="showUserPort != null">
             and show_user_port = #{showUserPort}
         </if>
-        order by lo.id desc
+        order by lo.create_time desc
         limit #{pageNo}, #{pageSize}
     </select>
     <sql id="lease_refund_order_column">
         id
-        ,lease_order_express_id,lease_order_id,status,type,file,reason,create_time
+        ,lease_order_express_id,lease_order_id,status,type,file,reason,create_time,modified_deposit
     </sql>
     <select id="getLeaseRefundOrder" resultType="com.mmc.oms.entity.lease.LeaseRefundOrderDO">
         select
@@ -229,4 +244,10 @@ proportion,show_user_port,create_time,update_time,unit_price,ware_num,deposit,st
             </foreach>
         </where>
     </select>
+    <select id="selectGiveBackByOrderId" resultType="com.mmc.oms.entity.lease.LeaseRefundOrderDO">
+        select
+        <include refid="lease_refund_order_column"/>
+        from lease_refund_order
+        where lease_order_id = #{id} and type = #{type}
+    </select>
 </mapper>
\ No newline at end of file