20220902

xiaoyong931011

2022-09-23 19ab08f041d6773f22594ed393105c623e09f543

 src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java

@@ -345,18 +345,16 @@
            mallOrderInfoMapper.updateById(mallOrderInfo);

            OrderStateDto orderStateDto = new OrderStateDto();
            orderStateDto.setOrderNo(mallOrderInfo.getOrderNo());
            String productNames = getProductNames(mallOrderInfo.getMemberId(), mallOrderInfo.getId());
            orderStateDto.setGoodsName(StrUtil.sub(productNames,0,10)+"...");
            orderStateDto.setOrderState("待自提");
            orderStateDto.setTakeCode(mallOrderInfo.getTakeCode());
            orderStateDto.setGoodsName(StrUtil.sub(productNames,0,15)+"...");
            String takeUniqueCode = mallOrderInfo.getTakeUniqueCode();
            MallTeamLeader mallTeamLeader = mallTeamLeaderMapper.selectLeaderByUniqueCode(takeUniqueCode);
            orderStateDto.setAddressArea(StrUtil.sub(mallTeamLeader.getAddressArea(),0,10)+"...");
            orderStateDto.setDetailAddress(StrUtil.sub(mallTeamLeader.getDetailAddress(),0,10)+"...");
            orderStateDto.setAmount(mallOrderInfo.getAmount().toString());
            orderStateDto.setAddressArea(mallTeamLeader.getAddressArea());
            orderStateDto.setDetailAddress(StrUtil.sub(mallTeamLeader.getDetailAddress(),0,20)+"...");
            orderStateDto.setRemark("果蔬等生鲜,请尽快取货");
            orderStateDto.setLeaderPhone(mallTeamLeader.getPhone());
            orderStateDto.setOpenId(mallMemberMapper.selectById(mallOrderInfo.getMemberId()).getOpenId());
            DataDictionaryCustom dataDictionaryCustom = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.WX_TEMPLATE_ID_ONE.getType(), DataDictionaryEnum.WX_TEMPLATE_ID_ONE.getCode());
            DataDictionaryCustom dataDictionaryCustom = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.WX_TEMPLATE_ID_THREE.getType(), DataDictionaryEnum.WX_TEMPLATE_ID_THREE.getCode());
            orderStateDto.setTemplateId(dataDictionaryCustom.getValue());
            iXcxPayService.pushOrderToAddress(orderStateDto);
//            iXcxPayService.uniformMessageSend(orderStateDto);
@@ -445,7 +443,7 @@
                temp.add(item.getLeaderName());
                temp.add(item.getLeaderPhone());
                temp.add(item.getAddressArea());
                temp.add(item.getProvince()+item.getCity()+item.getTownship()+item.getDetailAddress());
                temp.add(item.getDetailAddress());
                list.add(temp);

                adminMallOrderService.updateOrderStateAndDeliveryState(item.getId(), OrderStatusEnum.WAIT_FINISH.getValue(), OrderDeliveryStateEnum.DELIVERY_ING.getValue());