From 51adc16ecc9083d1f4fe7384bd4a8db64b9d34ea Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Tue, 7 May 2024 14:27:08 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E8=B4=A7?= =?UTF-8?q?=E9=87=91bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cool/store/enums/ErrorCodeEnum.java | 1 + .../cool/store/service/FirstOrderService.java | 2 +- .../service/impl/FirstOrderServiceImp.java | 37 ++----------------- ....java => PCOpenPreparationController.java} | 2 +- 4 files changed, 7 insertions(+), 35 deletions(-) rename coolstore-partner-web/src/main/java/com/cool/store/controller/webb/{OpenPreparationController.java => PCOpenPreparationController.java} (98%) diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java index 76915fe5f..1d17e0700 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java @@ -184,6 +184,7 @@ public enum ErrorCodeEnum { UPDATE_SHOP_SUB_STAGE_STATUS_FALSE(103009,"修改开业运营方案阶段状态失败",null), SHOP_ID_NOT_EXIST(103010,"shopId不存在",null), FIRST_ORDER_PARAM_NULL(103020,"首批订货金参数为空",null), + USER_NOT_LOGIN(103021,"用户未登录",null), XFSG_SERVICE_ERROR(103099,"鲜丰服务调用失败",null), GET_FIRST_ORDER(103021,"获取鲜丰首批订货金失败",null), diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/FirstOrderService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/FirstOrderService.java index b1be0354d..223d5dd68 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/FirstOrderService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/FirstOrderService.java @@ -16,5 +16,5 @@ public interface FirstOrderService { Integer saveOrder(FirstOrderRequest request, LoginUserInfo user); FirstOrderDTO getOrder(Long shopId); - FirstOrderDTO flush(Long shopId); + } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FirstOrderServiceImp.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FirstOrderServiceImp.java index 969abde63..959b7055c 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FirstOrderServiceImp.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FirstOrderServiceImp.java @@ -79,11 +79,9 @@ public class FirstOrderServiceImp implements FirstOrderService { //云立方同步 if (num > 0) { try { - // ShopInfoDO shopInfo = shopService.getShopInfo(order.getShopId()); - // String shopCode = shopInfo.getShopInfopCode(); -// String shopCode = "31310383"; -// Boolean flag = coolStoreStartFlowService.getFirstOrder(shopCode); - Boolean flag = Boolean.TRUE; + ShopInfoDO shopInfo = shopService.getShopInfo(order.getShopId()); + String storeNum = shopInfo.getStoreNum(); + Boolean flag = coolStoreStartFlowService.getFirstOrder(storeNum); log.info("saveOrder,flag:{}", flag); if (flag == null) { throw new ServiceException(ErrorCodeEnum.GET_FIRST_ORDER); @@ -105,7 +103,7 @@ public class FirstOrderServiceImp implements FirstOrderService { public FirstOrderDTO getOrder(Long shopId) { log.info("getOrder shopId:{},", shopId); if (shopId == null) { - log.error("shopId/shopCode is null"); + log.error("shopId is null"); throw new ServiceException(ErrorCodeEnum.FIRST_ORDER_PARAM_NULL); } FirstOrderDTO order = firstOrderDAO.selectFirstOrderByShopId(shopId); @@ -114,31 +112,4 @@ public class FirstOrderServiceImp implements FirstOrderService { order.setFirstOrderSubStage(firstOrderStageInfo.getShopSubStageStatus()); return order; } - - @Override - public FirstOrderDTO flush(Long shopId) { - ShopStageInfoDO orderStageInfo = shopStageInfoDAO.getShopSubStageInfo(shopId, ShopSubStageEnum.SHOP_STAGE_15); - try { - if (!orderStageInfo.getShopSubStageStatus(). - equals(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_151.getShopSubStageStatus())) { - ShopInfoDO shopInfo = shopService.getShopInfo(shopId); - String shopCode = shopInfo.getShopCode(); - Boolean flag = coolStoreStartFlowService.getFirstOrder(shopCode); - log.info("saveOrder,flag:{}", flag); - if (flag == null) { - throw new ServiceException(ErrorCodeEnum.GET_FIRST_ORDER); - } - if (flag) { - //更改子阶段状态 - shopStageInfoDAO.updateShopStageAndAuditInfo(shopId, - ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_151, null); - preparationService.whetherToOpenForAcceptance(shopId); - } - } - } catch (Exception e) { - log.error("获取鲜丰订货金异常", e); - } - FirstOrderDTO order = getOrder(shopId); - return order; - } } diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OpenPreparationController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCOpenPreparationController.java similarity index 98% rename from coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OpenPreparationController.java rename to coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCOpenPreparationController.java index 7615781bb..5b6031e90 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OpenPreparationController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCOpenPreparationController.java @@ -39,7 +39,7 @@ import java.util.List; @RequestMapping("/pc/openPreparation") @Api(tags = "pc开业筹备") @Slf4j -public class OpenPreparationController { +public class PCOpenPreparationController { @Resource private FirstOrderService firstOrderService; From 76ec232a801b54d90a7fafc8758b392636617975 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Tue, 7 May 2024 14:29:04 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E8=B4=A7?= =?UTF-8?q?=E9=87=91bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cool/store/service/impl/DecorationServiceImpl.java | 1 - 1 file changed, 1 deletion(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationServiceImpl.java index cf3b24210..831234f3b 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationServiceImpl.java @@ -627,7 +627,6 @@ public class DecorationServiceImpl implements DecorationService { @Override public ThreeSignResponse getThreeAcceptanceSign(Long shopId) { - ThreeSignResponse threeSignResponse = new ThreeSignResponse(); AcceptanceInfoDO acceptanceInfoDO = acceptanceInfoDAO.selectByShopId(shopId); if (Objects.isNull(acceptanceInfoDO)) { From d58f2aeba749d58de06accf83a11719e8ed16022 Mon Sep 17 00:00:00 2001 From: guohb Date: Tue, 7 May 2024 14:35:08 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=94=AF=E4=BB=98=E6=96=B0=E5=A2=9EshopId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cool/store/dao/LinePayDAO.java | 13 ++++++++++++- .../com/cool/store/mapper/LinePayMapper.java | 6 ++++-- .../src/main/resources/mapper/LinePayMapper.xml | 17 +++++++++++------ .../java/com/cool/store/entity/LinePayDO.java | 3 +++ .../store/service/impl/LinePayServiceImpl.java | 5 ++++- 5 files changed, 34 insertions(+), 10 deletions(-) diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/LinePayDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/LinePayDAO.java index 422cb4c08..a31d55f22 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/LinePayDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/LinePayDAO.java @@ -27,8 +27,19 @@ public class LinePayDAO { return linePayDO; } + public LinePayDO getByLineIdAndPayTypeAndShopId(Long lineId,Integer payBusinessType,Long shopId) { + LinePayDO linePayDO = linePayMapper.getByLineIdAndPayTypeAndShopId(lineId,payBusinessType,shopId); + return linePayDO; + } + + /** + * //todo 全部替换掉后弃用 + * @param lineId + * @param payBusinessType + * @return + */ public LinePayDO getLinePayByLineIdAndPayType(Long lineId,Integer payBusinessType) { - LinePayDO linePayDO = linePayMapper.getLinePayByLineIdAndPayType(lineId,payBusinessType); + LinePayDO linePayDO = linePayMapper.getByLineIdAndPayTypeAndShopId(lineId,payBusinessType,null); return linePayDO; } diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/LinePayMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/LinePayMapper.java index e30a5e8de..09b5a025a 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/LinePayMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/LinePayMapper.java @@ -40,8 +40,10 @@ public interface LinePayMapper { int deleteByPrimaryKey(Long id); LinePayDO getLinePayByLineId(@Param("lineId") Long lineId); - LinePayDO getLinePayByLineIdAndPayType(@Param("lineId") Long lineId, - @Param("payBusinessType")Integer payBusinessType); + + LinePayDO getByLineIdAndPayTypeAndShopId(@Param("lineId") Long lineId, + @Param("payBusinessType")Integer payBusinessType, + @Param("shopId") Long shopId); /** * getLinePayByLineIds diff --git a/coolstore-partner-dao/src/main/resources/mapper/LinePayMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/LinePayMapper.xml index cc730eed2..9162835ae 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/LinePayMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/LinePayMapper.xml @@ -4,6 +4,7 @@ + @@ -24,8 +25,7 @@ - id - , partner_id, line_id, pay_status, pay_type, pay_user_name, pay_account, bank_code, + id,shop_id, partner_id, line_id, pay_status, pay_type, pay_user_name, pay_account, bank_code, bank_name, branch_bank_code, branch_bank_name, pay_time, pay_pic, promise_pic, create_time, update_time, create_user_id, update_user_id, deleted,pay_business_type @@ -299,12 +299,17 @@ and deleted = '0' limit 1 - select * from xfsg_line_pay - where line_id = #{lineId} - and deleted = '0' - and pay_business_type = #{payBusinessType} + + line_id = #{lineId} + and deleted = '0' + and pay_business_type = #{payBusinessType} + + and shop_id = #{shopId} + +