submit

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/OrderAddBo.java

@@ -111,4 +111,6 @@ public class OrderAddBo {
     private Integer planId;
     @ApiModelProperty("新B端考试订单标识:1题库开通 2补冲考是标识")
     private Integer openQuestionSign;
+    @ApiModelProperty("业务系统订单标识")
+    private Integer orgSign;
 }

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

@@ -815,7 +815,9 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
         BigDecimal costTotal = new BigDecimal("0.00");//成本
         BigDecimal profitTotal = new BigDecimal("0.00"); //盈亏
         List<TopOldOrderGoods> orderGoodsList = topOrderGoodsService.list(new LambdaQueryWrapper<TopOldOrderGoods>()
-                .eq(TopOldOrderGoods::getOrderSn, order.getOrderSn()).in(TopOldOrderGoods::getCheckStatus, Arrays.asList(0, 1)).eq(TopOldOrderGoods::getStatus, 1));
+                .eq(TopOldOrderGoods::getOrderSn, order.getOrderSn())
+                .in(TopOldOrderGoods::getCheckStatus, Arrays.asList(0, 1 ,2))
+                .eq(TopOldOrderGoods::getStatus, 1));
         //佣金
         BigDecimal brokerage = order.getPretaxBrokerage();
         //平摊佣金
@@ -3756,7 +3758,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
         if (ObjectUtils.isNotNull(bo.getTenantId())){
             params.put("orgid", bo.getTenantId().toString());
         }else {
-            params.put("orgid", "1");
+            params.put("orgid", "0");
         }
         if (ObjectUtils.isNotNull(bo.getCreateSysUserId())){
             params.put("saleid", bo.getCreateSysUserId());
@@ -3773,10 +3775,12 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
             Object data = jsonObject.get("Data");
             if (ObjectUtils.isNotNull(data)){
                 trendVos = JSONArray.parseArray(JSONObject.toJSONString(data),TopConversionRateTrendVo.class);
-                trendVos.forEach(item -> {
-                    Long aLong = DateUtils.dateTimeSec("yyyy/MM/dd", item.getDate());
-                    item.setDate(DateUtils.timestampToDateFormat(aLong,"yyyy-MM-dd"));
-                });
+                if (bo.getType() != 3){
+                    trendVos.forEach(item -> {
+                        Long aLong = DateUtils.dateTimeSec("yyyy/MM/dd", item.getDate());
+                        item.setDate(DateUtils.timestampToDateFormat(aLong,"yyyy-MM-dd"));
+                    });
+                }
             }
         }catch (Exception e){
             e.printStackTrace();