藏家订单详情

ch-admin-api/src/main/java/com/wwdz/ch/admin/impl/SysDistributionOrderServiceImpl.java

@@ -108,9 +108,9 @@ public class SysDistributionOrderServiceImpl implements SysDistributionOrderServ
                 distributionOrderVo.setLogisticsName(LogisticsEnum.getNameByCode(distributionOrder.getLogisticsCode()));
                 distributionOrderVo.setBuyerName(cacheUtil.getAppletUserNameById(distributionOrder.getBuyerId()));
                 if (distributionOrder.getType() == DistributionEnum.DistributionTypeEnum.COLLECT.getCode()) {
-                    distributionOrderVo.setIntroducerName(cacheUtil.getAppletUserNameById(Long.valueOf(distributionOrder.getShareRecordId())));
+                    distributionOrderVo.setIntroducerName(distributionOrder.getShareRecordId().equals(CommConsts.DEFAULT_SHARE_ID) ? "系统账号" : cacheUtil.getAppletUserNameById(Long.valueOf(distributionOrder.getShareRecordId())));
                 }
-                distributionOrderVo.setSellerName(distributionOrder.getSellerId() == CommConsts.SYSTEM_ACCOUNT.longValue()? "系统账号" : cacheUtil.getAppletUserNameById(distributionOrder.getSellerId()));
+                distributionOrderVo.setSellerName(distributionOrder.getSellerId() == CommConsts.SYSTEM_ACCOUNT.longValue() ? "系统账号" : cacheUtil.getAppletUserNameById(distributionOrder.getSellerId()));
                 //支付截止时间，下单后半小时内
                 Date date = distributionOrder.getCreateTime();
                 Instant instant = date.toInstant().plus(Duration.ofMinutes(30));

ch-core/src/main/java/com/wwdz/ch/core/consts/DistributionEnum.java

@@ -272,6 +272,7 @@ public class DistributionEnum {
      * 鉴定单状态
      */
     public enum IdentifyOrderStateEnum {
+        WAIT_SEND(11, "待藏家寄出"),
         CHANNEL_WAIT_RECEIVE(12, "待平台收货"),
         CHANNEL_IDENTIFYING(13, "平台鉴定中"),
         CHANNEL_WAIT_SEND(14, "待平台发货"),

ch-core/src/main/java/com/wwdz/ch/core/util/TimeUtil.java

@@ -45,9 +45,12 @@ public final class TimeUtil {
     public static Pair getCurrentWeekDate() {
         SimpleDateFormat format = new SimpleDateFormat("yyyyMMdd");
         Calendar calStart = Calendar.getInstance();
+        Calendar calEnd = Calendar.getInstance();
         calStart.set(Calendar.DAY_OF_WEEK, Calendar.MONDAY);
+        calEnd.setFirstDayOfWeek(Calendar.MONDAY);
+        calEnd.set(Calendar.DAY_OF_WEEK, calEnd.getFirstDayOfWeek() + 6);
         String beginDate = format.format(calStart.getTime());
-        String endDate = format.format(new Date());
+        String endDate = format.format(calEnd.getTime());
         return Pair.of(beginDate, endDate);
     }
 
@@ -91,9 +94,11 @@ public final class TimeUtil {
     public static Pair getCurrentMonthDate() {
         SimpleDateFormat format = new SimpleDateFormat("yyyyMMdd");
         Calendar calStart = Calendar.getInstance();
+        Calendar calEnd = Calendar.getInstance();
         calStart.set(Calendar.DAY_OF_MONTH, 1);
+        calEnd.set(Calendar.DAY_OF_MONTH, calEnd.getActualMaximum(Calendar.DAY_OF_MONTH));
         String beginDate = format.format(calStart.getTime());
-        String endDate = format.format(new Date());
+        String endDate = format.format(calEnd.getTime());
         return Pair.of(beginDate, endDate);
     }
 
@@ -118,7 +123,7 @@ public final class TimeUtil {
 
 
     public static void main(String[] args) {
-        Pair<String, String> pair = getAccessDate(3);
+        Pair<String, String> pair = getAccessDate(5);
         System.out.println(pair.getFirst());
         System.out.println(pair.getSecond());
     }

ch-wx-api/src/main/java/com/wwdz/ch/wx/api/WxPayCallbackController.java

@@ -359,8 +359,8 @@ public class WxPayCallbackController {
                 String msg = "您的藏馆收到一个新订单,请前往" + url + "查看";
                 aliSmsSender.sendSms(distributionOrder.getSellerId(), msg);
             }
-            //创建鉴定单
-            identifyOrderService.createIdentifyOrder(distributionOrderId);
+          /*  //创建鉴定单
+            identifyOrderService.createIdentifyOrder(distributionOrderId);*/
             return Result.success();
         } catch (Exception e) {
             logger.error(">>>>>>>>>>>> 藏馆订单，微信支付回调通知处理失败 error :{}", e);
@@ -370,8 +370,6 @@ public class WxPayCallbackController {
     }
 
 
-
-
     /**
      * 更新折扣订单状态
      * @return

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/distribution/DistributionOrderServiceImpl.java

@@ -691,7 +691,11 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
             if (distributionOrder.getState() != DistributionEnum.DistributionOrderStateEnum.PRE_SEND.getCode()) {
                 return Result.failed("订单状态错误，不能发货");
             }
-            IdentifyOrder identifyOrder = identifyOrderDao.findByDistributionOrderId(distributionOrderId);
+
+            //创建鉴定单
+            identifyOrderService.createIdentifyOrder(distributionOrderId);
+
+           /* IdentifyOrder identifyOrder = identifyOrderDao.findByDistributionOrderId(distributionOrderId);
             //修改鉴定单状态。待平台收货
             IdentifyOrder updateDto = new IdentifyOrder();
             updateDto.setIdentifyOrderId(identifyOrder.getIdentifyOrderId());
@@ -702,7 +706,7 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
             updateDto.setReturnPhone(dto.getReturnPhone());
             updateDto.setState(DistributionEnum.IdentifyOrderStateEnum.CHANNEL_WAIT_RECEIVE.getCode());
             identifyOrderDao.update(updateDto);
-
+            */
 
           /*  Date now = new Date();
             DistributionOrder orderUpdateDto = new DistributionOrder();
@@ -1086,7 +1090,7 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
                 distributionOrderDetailVo.setProfit(PriceUtil.convertPriceFenToYuan(distributorProfit.getProfit()));
             }
 
-            //如果藏家订单是取消状态，查询对应鉴定单状态
+            //查询对应鉴定单状态
             IdentifyOrder identifyOrder = identifyOrderDao.findByDistributionOrderId(dto.getDistributionOrderId());
             if (identifyOrder != null) {
                 distributionOrderDetailVo.setOutLogisticsCode(identifyOrder.getOutLogisticsCode());
@@ -1096,6 +1100,13 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
                 distributionOrderDetailVo.setApproved(identifyOrder.getApproved());
                 distributionOrderDetailVo.setApprovedRemark(identifyOrder.getRemark());
                 distributionOrderDetailVo.setIdentifyOrderId(identifyOrder.getIdentifyOrderId());
+
+                distributionOrderDetailVo.setFromLogisticsCode(identifyOrder.getFromLogisticsCode());
+                distributionOrderDetailVo.setFromLogisticsName(LogisticsEnum.getNameByCode(identifyOrder.getFromLogisticsCode()));
+                distributionOrderDetailVo.setFromWaybill(identifyOrder.getFromWaybill());
+                distributionOrderDetailVo.setReceiverAddress(CommConsts.SYSTEM_DEFAULT_ADDRESS);
+            } else {
+                distributionOrderDetailVo.setTransferState(DistributionEnum.IdentifyOrderStateEnum.WAIT_SEND.getCode());
             }
 
             //一口价支付截止时间为下单半小时后，竞拍为24小时