suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge #90 into master from cc_20260407_bzj

Browse Source 
feat：时间处理

* cc_20260407_bzj: (3 commits squashed)

  - feat：新增设备费用

  - feat：分账

  - feat：时间处理

Signed-off-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>
Merged-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/90
This commit is contained in:
正新
2026-04-08 11:41:54 +00:00
parent 68cef4b83a
commit 77ca18b6fc
13 changed files with 121 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
coolstore-partner-web/src/main/java/com/cool/store/controller/webc/TestController.java
View File

@@ -13,10 +13,7 @@ import com.cool.store.dto.wallet.OpenBasicInfoDTO;
import com.cool.store.entity.*;
import com.cool.store.entity.fees.ShopAllocationInfoDO;
import com.cool.store.entity.fees.WalletPayInfoDO;
import com.cool.store.enums.ErrorCodeEnum;
import com.cool.store.enums.IDCardSideEnum;
import com.cool.store.enums.WorkflowSubStageEnum;
import com.cool.store.enums.XGJCollectionStatusEnum;
import com.cool.store.enums.*;
import com.cool.store.enums.point.ShopStageEnum;
import com.cool.store.enums.point.ShopSubStageEnum;
import com.cool.store.enums.point.ShopSubStageStatusEnum;
@@ -30,11 +27,13 @@ import com.cool.store.request.wallet.CoolOpenBasicInfoRequest;
import com.cool.store.request.xfsgFirstOrderListRequest;
import com.cool.store.request.xgj.FranchiseFeeCallBackRequest;
import com.cool.store.request.xgj.ReceiptCallBackRequest;
import com.cool.store.request.xgj.ReceiptRequest;
import com.cool.store.response.MiniShopsResponse;
import com.cool.store.response.ResponseResult;
import com.cool.store.response.caipin.StoreUserResponse;
import com.cool.store.response.xfsgFirstOderListResponse;
import com.cool.store.service.*;
import com.cool.store.service.impl.CommonService;
import com.cool.store.service.wallet.WalletService;
import com.cool.store.service.close.CloseStoreAccountService;
import com.cool.store.service.close.CloseStoreRefundService;
@@ -109,6 +108,17 @@ public class TestController {
private WalletPayInfoDAO walletPayInfoDAO;
@Resource
private ShopAllocationInfoDAO shopAllocationInfoDAO;
@Resource
UserAuthMappingService userAuthMappingService;
@Resource
CommonService commonService;
@Autowired
private ShopInfoDAO shopInfoDAO;
@Resource
PushService pushService;
@Resource
FranchiseFeeDAO franchiseFeeDAO;
@PostMapping("/walletXgjCallBack")
public ResponseResult<Boolean> walletXgjCallBack(Long payInfoId) {
@@ -467,4 +477,28 @@ public class TestController {
@RequestParam(value = "storeCode", required = false) String storeCode) {
return ResponseResult.success(storeService.handleStoreLogLai(flag,storeCode));
}
@GetMapping("/testSendMsg")
public ResponseResult<Boolean> testSendMsg(@RequestParam(value = "poneNumber", required = false) String poneNumber ,
@RequestParam(value = "templateCode", required = false) SMSMsgEnum templateCode) {
commonService.sendSms(poneNumber, templateCode);
return ResponseResult.success();
}
@GetMapping("/pushReceiptToXGJ")
public ResponseResult<Boolean> pushReceiptToXGJ(@RequestParam(value = "shopId", required = false) Long shopId,
@RequestParam(value = "payId", required = false) Long payId) {
ShopInfoDO shopInfoDO = shopInfoDAO.getShopInfo(shopId);
if (shopInfoDO==null){
return ResponseResult.success(Boolean.FALSE);
}
FranchiseFeeDO franchiseFeeDO = franchiseFeeDAO.selectByShopId(shopInfoDO.getId());
WalletPayInfoDO payInfo = walletPayInfoDAO.getById(payId);
if (franchiseFeeDO==null||payInfo==null){
return ResponseResult.success(Boolean.FALSE);
}
ReceiptRequest receiptRequest = new ReceiptRequest(shopInfoDO.getId(), franchiseFeeDO.getId().intValue(), payInfo, Integer.valueOf(shopInfoDO.getFranchiseBrand()));
pushService.pushReceiptToXGJ(receiptRequest);
return ResponseResult.success(Boolean.TRUE);
}
}