付款凭证审核修改

src/main/java/com/mmc/oms/dao/uav/UavCartDao.java

@@ -12,4 +12,6 @@ public interface UavCartDao {
     void addCart(UavCartDO uavCartDO);
 
     void remove(Integer id);
+
+    UavCartDO getUavCartDO(Integer id);
 }

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

@@ -33,6 +33,10 @@ public class UavCartServiceImpl implements UavCartService {
 
     @Override
     public ResultBody updateNum(Integer id, Integer buyNum) {
+        UavCartDO uavCartDO = uavCartDao.getUavCartDO(id);
+        if (uavCartDO != null) {
+            return ResultBody.error("购物车信息不存在！");
+        }
         return null;
     }
 

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

@@ -524,6 +524,11 @@ public class UavOrderServiceImpl implements UavOrderService {
                 uavPurchaseOrderDO.setStatusCode(UavOrderStatus.CONFIRM.getCode());
                 uavPODao.addPurchaseOrder(uavPurchaseOrderDO);
             }
+        }else {
+            if (uavOrderDO.getStatusCode().equals(UavOrderStatus.FINISH_PAYING.getCode())) {
+                // 第一次未通过，需要走回上一步
+                this.updateUavOrderStatus(beforeUavOrderPayDO.getUavOrderId(), UavOrderStatus.SIGN);
+            }
         }
         UavOrderPayDO uavOrderPayDO = new UavOrderPayDO(uavOrderPayVO);
         uavOrderDao.checkPay(uavOrderPayDO);

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

@@ -213,6 +213,11 @@ public class UavPOServiceImpl implements UavPOService {
                 uavPOrder.getStatusCode().equals(UavOrderStatus.FINISH_PAYING.getCode())) {
             // 只有待付款凭证需要修改状态
             this.updateUavPOrderStatus(uavPOrder.getId(), UavOrderStatus.FINISH_PAYING);
+        }else {
+            if (uavPOrder.getStatusCode().equals(UavOrderStatus.FINISH_PAYING.getCode())) {
+                // 第一次未通过，需要走回上一步
+                this.updateUavPOrderStatus(uavPOrder.getId(), UavOrderStatus.SIGN);
+            }
         }
         UavPurchaseOrderPayDO uavOrderPayDO = new UavPurchaseOrderPayDO(uavOrderPayVO);
         uavPODao.updateUavPOrderPay(uavOrderPayDO);

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

@@ -9,7 +9,18 @@
          #{priceStockId}, #{productSpec}, #{orderNum}, #{salePrice}, #{skuImage}, #{skuNo}, NOW());
     </insert>
 
+    <sql id="cart_column">
+        id, user_account_id, third_back_user_account_id, company_name, mall_goods_id, trade_name, price_stock_id,
+    product_spec, order_num, sale_price, sku_image, sku_no, create_time
+    </sql>
+
     <update id="remove">
         update uav_cart set is_deleted = 1 where id = #{id}
     </update>
+
+    <select id="getUavCartDO" resultType="com.mmc.oms.entity.uav.UavCartDO">
+        select <include refid="cart_column"/>
+        from uav_cart
+        where id = #{id}
+    </select>
 </mapper>
\ No newline at end of file