订单列表报错、采购订单上传付款凭证等修复

src/main/java/com/mmc/oms/model/qo/uav/UavOrderQO.java

@@ -36,7 +36,7 @@ public class UavOrderQO implements Serializable {
     private Integer thirdBackUserAccountId;
 
     @ApiModelProperty(value = "订单是否展示给用户", hidden = true)
-    private Integer show;
+    private Integer showUserPort;
 
     @ApiModelProperty(value = "开始时间")
     private String startTime;

src/main/java/com/mmc/oms/service/uav/impl/UavOrderServiceImpl.java

@@ -342,7 +342,7 @@ public class UavOrderServiceImpl implements UavOrderService {
     @Override
     public ResultBody listByUid(UavOrderQO uavOrderQO, BaseAccountDTO currentAccount) {
         uavOrderQO.setUserAccountId(currentAccount.getUserAccountId());
-        uavOrderQO.setShow(1);
+        uavOrderQO.setShowUserPort(1);
         int count = uavOrderDao.countList(uavOrderQO);
         if (count == 0) {
             return ResultBody.success(PageResult.buildPage(uavOrderQO.getPageNo(), uavOrderQO.getPageSize(), count));

src/main/java/com/mmc/oms/service/uav/impl/UavPOServiceImpl.java

@@ -156,14 +156,13 @@ public class UavPOServiceImpl implements UavPOService {
     @Override
     public ResultBody upLoadPay(UavOrderPayVO uavOrderPayVO) {
         UavPurchaseOrderDO uavPOrder = uavPODao.getUavPOrder(uavOrderPayVO.getUavOrderId());
-        if (!uavPOrder.getStatusCode().equals(UavOrderStatus.PAYING.getCode())) {
-            return ResultBody.error("操作有误，请重试！");
-        }
         UavPurchaseOrderPayDO uavOrderPayDO = new UavPurchaseOrderPayDO(uavOrderPayVO);
         uavOrderPayDO.setUavPOrderId(uavOrderPayVO.getUavOrderId());
         uavPODao.addPurchaseOrderPay(uavOrderPayDO);
-        // 修改订单状态
-        this.updateUavPOrderStatus(uavPOrder.getId(), UavOrderStatus.PAYING);
+        if (uavPOrder.getStatusCode().equals(UavOrderStatus.PAYING.getCode())) {
+            // 修改订单状态
+            this.updateUavPOrderStatus(uavPOrder.getId(), UavOrderStatus.PAYING);
+        }
         return ResultBody.success();
     }
 
@@ -172,17 +171,12 @@ public class UavPOServiceImpl implements UavPOService {
     public ResultBody checkPay(UavOrderPayVO uavOrderPayVO) {
         UavPurchaseOrderPayDO uavPurchaseOrderPayDO = uavPODao.getUavPOrderPayById(uavOrderPayVO.getId());
         UavPurchaseOrderDO uavPOrder = uavPODao.getUavPOrder(uavPurchaseOrderPayDO.getUavPOrderId());
-        if (!uavPOrder.getStatusCode().equals(UavOrderStatus.FINISH_PAYING.getCode())) {
-            return ResultBody.error("操作有误，请重试！");
+        if (uavOrderPayVO.getCheckStatus().equals(1) && uavPOrder.getStatusCode().equals(UavOrderStatus.FINISH_PAYING.getCode())) {
+            // 只有待付款凭证需要修改状态
+            this.updateUavPOrderStatus(uavPOrder.getId(), UavOrderStatus.FINISH_PAYING);
         }
         UavPurchaseOrderPayDO uavOrderPayDO = new UavPurchaseOrderPayDO(uavOrderPayVO);
         uavPODao.updateUavPOrderPay(uavOrderPayDO);
-        if (uavOrderPayVO.getCheckStatus().equals(1)) {
-            // 修改订单状态
-            this.updateUavPOrderStatus(uavPOrder.getId(), UavOrderStatus.FINISH_PAYING);
-        }else {
-            this.updateUavPOrderStatus(uavPOrder.getId(), UavOrderStatus.PAYING);
-        }
         return ResultBody.success();
     }
 

src/main/resources/mapper/uav/UavOrderDao.xml

@@ -147,7 +147,7 @@
     </update>
 
     <update id="closeShowUavOrder">
-        update uav_order set show = 0 where id = #{id}
+        update uav_order set show_user_port = 0 where id = #{id}
     </update>
 
     <select id="detail" resultType="com.mmc.oms.entity.uav.UavOrderDO">
@@ -211,8 +211,8 @@
         <if test="endTime != null">
             and #{endTime} >= create_time
         </if>
-        <if test="show != null">
-            and show = #{show}
+        <if test="showUserPort != null">
+            and show_user_port = #{showUserPort}
         </if>
     </select>
 
@@ -242,8 +242,8 @@
         <if test="endTime != null">
             and #{endTime} >= uo.create_time
         </if>
-        <if test="show != null">
-            and show = #{show}
+        <if test="showUserPort != null">
+            and show_user_port = #{showUserPort}
         </if>
         order by uo.id desc
         limit #{pageNo}, #{pageSize}

src/main/resources/mapper/uav/UavPODao.xml

@@ -42,7 +42,7 @@
     <insert id="addPurchaseOrderPay" parameterType="com.mmc.oms.entity.uav.UavPurchaseOrderPayDO" useGeneratedKeys="true" keyProperty="id">
         insert into uav_purchase_order_pay(
                     uav_purchase_order_id, pay_img_list, check_status, pay_remark, refuse_reason, create_time, check_time )
-        values(#{uavPurchaseOrderId}, #{payImgList}, #{checkStatus}, #{payRemark}, #{refuseReason}, NOW(), #{checkTime})
+        values(#{uavPOrderId}, #{payImgList}, #{checkStatus}, #{payRemark}, #{refuseReason}, NOW(), #{checkTime})
     </insert>
 
     <update id="updateUavPOrderStatus">