核销订单数

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/order/GicOrderController.java

@@ -177,7 +177,14 @@ public class GicOrderController {
         qdto.setEnterpriseId(enterpriseId);
         // 配送方式 -1：所有 2：门店自提 1：快递发货
         qdto.setDeliveryType(2);
-        qdto.setOrderStep("" + status);
+        qdto.setPickUpStoreId(storeId);
+        if (status == 1) {
+            qdto.setOrderStep("2");
+        }
+        if (status == 2) {
+            qdto.setWriteOffClerkId(clerkId);
+            qdto.setOrderStep("4");
+        }
         qdto.setBusinessType(OrderEnum.BusinessTypeEnum.MICRO_MALL.getType());
         qdto.setSearchOrderParam(search);
         return this.orderListSelect(qdto, pageInfo, false);
@@ -270,7 +277,7 @@ public class GicOrderController {
         List<OrderListItemVO> voList = new ArrayList<>();
         for (ListOrderItemDTO item : list) {
             if (StringUtils.isEmpty(item.getLogisticsId())) {
-                OrderListItemVO vo = EntityUtil.changeEntityNew(OrderListItemVO.class, item);
+                OrderListItemVO vo = EntityUtil.changeEntityByJSON(OrderListItemVO.class, item);
 
                 GoodsStockBaseQDTO stockQDTO = new GoodsStockBaseQDTO();
                 stockQDTO.setEnterpriseId(enterpriseId);
@@ -492,8 +499,9 @@ public class GicOrderController {
         int integralUndoneCount = page.getTotalCount();
         int integralDoneCount = this.orderVerificationRecordApiService.countByGicClerkId(clerkId);
         // 查询微商城
-        int mallDoneCount = 0;
-        int mallUndoneCount = 0;
+        int mallDoneCount = this.count(enterpriseId, storeId, clerkId, 4);
+        int mallUndoneCount = this.count(enterpriseId, storeId, clerkId, 2);
+        ;
         HxOrderCountVO vo = new HxOrderCountVO();
         vo.setIntegralDoneCount(integralDoneCount);
         vo.setIntegralUndoneCount(integralUndoneCount);
@@ -504,6 +512,25 @@ public class GicOrderController {
         return RestResponse.successResult(vo);
     }
 
+    private int count(String enterpriseId, String storeId, String clerkId, int step) {
+        // 查询门店
+        ListOrderManageQDTO qdto = new ListOrderManageQDTO();
+        qdto.setEnterpriseId(enterpriseId);
+        // 配送方式 -1：所有 2：门店自提 1：快递发货
+        qdto.setDeliveryType(2);
+        qdto.setPickUpStoreId(storeId);
+        if (step == 4) {
+            qdto.setWriteOffClerkId(clerkId);
+        }
+        qdto.setOrderStep("" + step);
+        qdto.setBusinessType(OrderEnum.BusinessTypeEnum.MICRO_MALL.getType());
+        qdto.setPageNum(1);
+        qdto.setPageSize(1);
+        ServiceResponse<Page<ListOrderDTO>> ret = webOrderManageApiService.listOrder(qdto);
+        logger.info("核销订单数={}");
+        return ret.getResult().getTotalCount();
+    }
+
     // 订单详情
     private OrderDetailVO getOrderDetail(String enterpriseId, OrderInfoDTO orderInfo,
             List<ListOrderItemDTO> orderItemDTOList, String storeId) {
@@ -520,7 +547,7 @@ public class GicOrderController {
                     memberId);
             MemberStoreInfoDTO memberInfo = memberResp.getResult();
             if (null != memberInfo) {
-                member = EntityUtil.changeEntityNew(MemberInfoVO.class, memberInfo);
+                member = EntityUtil.changeEntityByJSON(MemberInfoVO.class, memberInfo);
             }
         }
         member.setAddressPhone(orderInfo.getBuyerPhone());
@@ -559,7 +586,7 @@ public class GicOrderController {
                 List<ListOrderDTO> orderList = page.getResult();
                 for (ListOrderDTO order : orderList) {
                     orderIdList.add(order.getOrderId());
-                    OrderListVO vo = EntityUtil.changeEntityNew(OrderListVO.class, order);
+                    OrderListVO vo = EntityUtil.changeEntityByJSON(OrderListVO.class, order);
                     List<ListOrderItemDTO> itemList = order.getOrderItemDTOList();
                     List<OrderListItemVO> voItemList = EntityUtil.changeEntityListNew(OrderListItemVO.class, itemList);
                     vo.setOrderItemList(voItemList);

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/order/GicOrderRefundController.java

@@ -97,7 +97,7 @@ public class GicOrderRefundController {
     public RestResponse<Object> refundDetail(String enterpriseId, String storeId, String orderRefundId) {
         ServiceResponse<OrderRefundDetailDTO> resp = this.orderRefundApiService.refundDetail(orderRefundId);
         OrderRefundDetailDTO dto = resp.getResult();
-        OrderRefundDetailVO vo = EntityUtil.changeEntityNew(OrderRefundDetailVO.class, dto);
+        OrderRefundDetailVO vo = EntityUtil.changeEntityByJSON(OrderRefundDetailVO.class, dto);
         this.fillMemberInfo(enterpriseId, vo.getMemberId(), vo, null);
         // 判断好办端能否审批(确认收货) 只有收货门店能确认
         // 退货地址类型 0归属门店 1发货门店 2平台地址
@@ -118,7 +118,7 @@ public class GicOrderRefundController {
     public RestResponse<Object> exchangeDetail(String enterpriseId, String storeId, String orderExchangeId) {
         ServiceResponse<OrderExchangeDetailDTO> resp = this.orderRefundApiService.exchangeDetail(orderExchangeId);
         OrderExchangeDetailDTO dto = resp.getResult();
-        OrderExchangeDetailVO vo = EntityUtil.changeEntityNew(OrderExchangeDetailVO.class, dto);
+        OrderExchangeDetailVO vo = EntityUtil.changeEntityByJSON(OrderExchangeDetailVO.class, dto);
         String targetProSkuId = resp.getResult().getTargetProSkuId();
         // 查询库存
         vo.setTargetProStock(1);
@@ -157,7 +157,7 @@ public class GicOrderRefundController {
         ServiceResponse<Void> resp = null;
         // 拒绝
         if (auditStatus == 1) {
-            RefundRefusedQDTO qdto = EntityUtil.changeEntityNew(RefundRefusedQDTO.class, baseQDTO);
+            RefundRefusedQDTO qdto = EntityUtil.changeEntityByJSON(RefundRefusedQDTO.class, baseQDTO);
             qdto.setReason(remark);
             if (step == 1) {
                 resp = this.afterSalesManageApiService.refundSellerRefusedApply(enterpriseId, memberId, qdto);
@@ -169,12 +169,12 @@ public class GicOrderRefundController {
         // 同意
         if (auditStatus == 2) {
             if (step == 1) {
-                RefundSellerAgreeQDTO qdto = EntityUtil.changeEntityNew(RefundSellerAgreeQDTO.class, baseQDTO);
+                RefundSellerAgreeQDTO qdto = EntityUtil.changeEntityByJSON(RefundSellerAgreeQDTO.class, baseQDTO);
                 qdto.setApplyRefundPrice(applyRefundPrice);
                 resp = this.afterSalesManageApiService.refundSellerConfirmApply(enterpriseId, memberId, qdto);
             }
             if (step == 2) {
-                RefundSellerConfirmGoodsQDTO qdto = EntityUtil.changeEntityNew(RefundSellerConfirmGoodsQDTO.class,
+                RefundSellerConfirmGoodsQDTO qdto = EntityUtil.changeEntityByJSON(RefundSellerConfirmGoodsQDTO.class,
                         baseQDTO);
                 qdto.setApplyRefundPrice(applyRefundPrice);
                 resp = this.afterSalesManageApiService.refundSellerConfirmGoods(enterpriseId, memberId, qdto);
@@ -198,7 +198,7 @@ public class GicOrderRefundController {
         ServiceResponse<Void> resp = null;
         // 拒绝
         if (auditStatus == 1) {
-            ExchangeRefusedQDTO qdto = EntityUtil.changeEntityNew(ExchangeRefusedQDTO.class, baseQDTO);
+            ExchangeRefusedQDTO qdto = EntityUtil.changeEntityByJSON(ExchangeRefusedQDTO.class, baseQDTO);
             qdto.setRemark(remark);
             if (step == 1) {
                 resp = this.afterSalesManageApiService.exchangeSellerRefused(enterpriseId, memberId, qdto);
@@ -209,7 +209,7 @@ public class GicOrderRefundController {
         }
         // 同意
         if (auditStatus == 2) {
-            ExchangeSellerAgreeApplyQDTO qdto = EntityUtil.changeEntityNew(ExchangeSellerAgreeApplyQDTO.class,
+            ExchangeSellerAgreeApplyQDTO qdto = EntityUtil.changeEntityByJSON(ExchangeSellerAgreeApplyQDTO.class,
                     baseQDTO);
             if (step == 1) {
                 qdto.setExchangeAddress(address);
@@ -255,7 +255,7 @@ public class GicOrderRefundController {
         List<RefundAddressDTO> list = resp.getResult();
         List<RefundAddressVO> sellerAddressList = new ArrayList<>();
         list.forEach(dto -> {
-            RefundAddressVO item = EntityUtil.changeEntityNew(RefundAddressVO.class, dto);
+            RefundAddressVO item = EntityUtil.changeEntityByJSON(RefundAddressVO.class, dto);
             if (dto.getAddressType() == 0) {
                 vo.setOwnerStoreAddress(item);
             }