submit

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/domain/OrderGoods.java

@@ -37,6 +37,8 @@ private static final long serialVersionUID=1L;
     private String orderSn;
     /** 商品id */
     private Long goodsId;
+    /** 商品年份 */
+    private String goodsYear;
     /** 商品采集数据 */
     private String goodsInputData;
     /** 商品标准价格 */

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderServiceImpl.java

@@ -494,7 +494,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             orderGoods.setCompany(bo.getOrderStudent().getCompany());
             //成交价
             orderGoods.setGoodsRealPrice(goods.getStandPrice());
-
+            orderGoods.setGoodsYear(goods.getYear().toString());
             orderGoods.setCreateTime(DateUtils.getNowTime());
             orderGoods.setUpdateTime(DateUtils.getNowTime());
 
@@ -632,7 +632,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             }
             //成交价
             orderGoods.setGoodsRealPrice(g.getGoodsRealPrice());
-
+            orderGoods.setGoodsYear(goods.getYear().toString());
             orderGoods.setCreateTime(DateUtils.getNowTime());
             orderGoods.setUpdateTime(DateUtils.getNowTime());
             orderGoods.setGoodsReceived(g.getGoodsReceived());
@@ -814,6 +814,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             body = "中正祥粤云-" + goods.getGoodsName();
             OrderGoods orderGoods = BeanUtil.toBean(g, OrderGoods.class);
             orderGoods.setOrderSn(out_trade_no);
+            orderGoods.setGoodsYear(goods.getYear().toString());
             if (g.getGoodsInputData() != null) {
                 orderGoods.setGoodsInputData(JSON.toJSONString(g.getGoodsInputData()));
             }
@@ -1221,6 +1222,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             //成交价
             orderGoods.setStatus(1);
             orderGoods.setCreateTime(DateUtils.getNowTime());
+            orderGoods.setGoodsYear(goods.getYear().toString());
             orderGoods.setUpdateTime(DateUtils.getNowTime());
             if (StringUtils.isNotBlank(g.getDistributionCode())){
                 //分销订单
@@ -1405,6 +1407,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             orderGoods.setCompany(bo.getOrderStudent().getCompany());*/
             //成交价
             orderGoods.setStatus(1);
+            orderGoods.setGoodsYear(goods.getYear().toString());
             orderGoods.setGoodsRealPrice(goods.getStandPrice());
             orderGoods.setGoodsPrice(goods.getStandPrice());
             orderGoods.setCreateTime(DateUtils.getNowTime());

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/bo/TopOldOrderGoodsAddBo.java

@@ -22,6 +22,9 @@ public class TopOldOrderGoodsAddBo {
     /** 商品id */
     @ApiModelProperty("商品id")
     private Long goodsId;
+    /** 商品年份 */
+    @ApiModelProperty("商品年份")
+    private String goodsYear;
     /** 商品标准价格 */
     @ApiModelProperty("商品标准价格")
     private BigDecimal goodsPrice;

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/domain/TopOldOrderGoods.java

@@ -33,6 +33,8 @@ private static final long serialVersionUID=1L;
     private String orderSn;
     /** 商品id */
     private Long goodsId;
+    /** 商品年份 */
+    private String goodsYear;
     /** 商品标准价格 */
     private BigDecimal goodsPrice;
     /** 商品成交价格 */

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/impl/TopOldOrderServiceImpl.java

@@ -260,6 +260,16 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
         if (ObjectUtils.isNotNull(orderVo.getOrderReceived()) && ObjectUtils.isNotNull(orderVo.getOrderRefunded())) {
             orderVo.setOrderPractical(orderVo.getOrderReceived().subtract(orderVo.getOrderRefunded()));
         }
+        TopOldOrderCheckLog checkLog = topOldOrderCheckLogService
+                .getOne(new LambdaQueryWrapper<TopOldOrderCheckLog>()
+                        .eq(TopOldOrderCheckLog::getOrderSn, orderSn)
+                        .eq(TopOldOrderCheckLog::getType, 1)//B端订单审核
+                        .eq(TopOldOrderCheckLog::getCheckSign, 1)
+                        .last("limit 1"));
+        if (ObjectUtils.isNotNull(checkLog)){
+            orderVo.setCheckReason(checkLog.getCheckReason());
+        }
+
         return orderVo;
     }
 
@@ -1090,6 +1100,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                     brokerageFlag = true;
                 }
                 oldOrder.setCheckStatus(bo.getCheckStatus());
+                checkLog.setCheckStatus(1);
                 break;
             case 2://拒绝 恢复原本的佣金
                 if (StringUtils.isNotBlank(oldOrder.getCostJson())
@@ -1110,6 +1121,8 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                 } else {
                     oldOrder.setCheckStatus(bo.getCheckStatus());
                 }
+                checkLog.setCheckStatus(-1);
+                checkLog.setCheckReason(bo.getCheckReason());
                 break;
             default:
                 break;
@@ -1125,6 +1138,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
         }
 
         updateById(oldOrder);
+        topOldOrderCheckLogService.updateById(checkLog);
 
         if (bo.getCheckStatus() == 1 && oldOrder.getFinishSign() == 0 && oldOrder.getOrderUncollected().compareTo(BigDecimal.ZERO) == 0) {
             //订单审核通过，账款已结清，满足完单条件

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/vo/TopOldOrderGoodsListVo.java

@@ -31,6 +31,9 @@ public class TopOldOrderGoodsListVo {
 	/** 商品id */
 	@ApiModelProperty("商品id")
 	private Long goodsId;
+	/** 商品年份 */
+	@ApiModelProperty("商品年份")
+	private String goodsYear;
 	/** 商品标准价格 */
 	@ApiModelProperty("商品标准价格")
 	private BigDecimal goodsPrice;

zhongzheng-system/src/main/resources/mapper/modules/order/OrderGoodsMapper.xml

@@ -800,6 +800,7 @@
         <result property="goodsPrice" column="goods_price"/>
         <result property="goodsRealPrice" column="goods_real_price"/>
         <result property="checkStatus" column="check_status"/>
+        <result property="goodsYear" column="goods_year"/>
     </resultMap>
 
     <select id="listByOrderSn" parameterType="com.zhongzheng.modules.top.goods.bo.TopOldOrderGoodsQuery" resultMap="getlist">
@@ -816,6 +817,7 @@
             CONCAT( cb.business_name, cpt.project_name ) AS business_name,
             og.goods_price,
             og.goods_real_price,
+            og.goods_year,
             1 as check_status
         FROM
             order_goods og

zhongzheng-system/src/main/resources/mapper/modules/top/TopOldOrderGoodsMapper.xml

@@ -40,6 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="goodsRealPrice" column="goods_real_price"/>
         <result property="signId" column="sign_id"/>
         <result property="checkStatus" column="check_status"/>
+        <result property="goodsYear" column="goods_year"/>
     </resultMap>
 
     <select id="getListByQuery" parameterType="com.zhongzheng.modules.top.goods.bo.TopOldOrderGoodsQuery" resultMap="getlist">
@@ -53,6 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             business_name,
             goods_price,
             goods_real_price,
+            goods_year,
             sign_id,
             check_status
         FROM