diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/notify/WxPayNotifyController.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/notify/WxPayNotifyController.java index 228301741..3f665e32b 100644 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/notify/WxPayNotifyController.java +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/notify/WxPayNotifyController.java @@ -6,6 +6,7 @@ import cn.hutool.json.JSONUtil; import cn.iocoder.yudao.module.shop.dal.dataobject.recharge.RechargeOrderDO; import cn.iocoder.yudao.module.shop.dal.mysql.recharge.RechargeOrderMapper; import cn.iocoder.yudao.module.shop.service.order.StoreOrderService; +import cn.iocoder.yudao.module.shop.service.recharge.PhoneRecordService; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.binarywang.wxpay.bean.notify.OriginNotifyResponse; import com.github.binarywang.wxpay.bean.notify.SignatureHeader; @@ -46,6 +47,8 @@ public class WxPayNotifyController { @Autowired private RechargeOrderMapper rechargeOrderMapper; + private PhoneRecordService phoneRecordService; + /** * Description: 微信支付回调接口 @@ -138,6 +141,8 @@ public class WxPayNotifyController { orderDO.setRefundStatus(2); orderDO.setPaid(2); rechargeOrderMapper.updateById(orderDO); + //删除提报记录 + phoneRecordService.deletePhoneGear(orderDO.getOrderId()); // 修改订单状态 // 写入 response.setStatus(HttpServletResponse.SC_OK); diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/recharge/RechargeGearController.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/recharge/RechargeGearController.java index e463aaf1b..edf221e1a 100644 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/recharge/RechargeGearController.java +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/recharge/RechargeGearController.java @@ -74,7 +74,7 @@ public class RechargeGearController { @Operation(summary = "获得充值档位列表") @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048") @PreAuthorize("@ss.hasPermission('shop:recharge-gear:query')") - public CommonResult> getRechargeGearList(@RequestParam("ids") Collection ids) { + public CommonResult> getRechargeGearList(@RequestParam("ids") List ids) { List list = rechargeGearService.getRechargeGearList(ids); return success(RechargeGearConvert.INSTANCE.convertList(list)); } diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/app/recharge/AppPhoneRecordController.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/app/recharge/AppPhoneRecordController.java index 021fe9fdd..8b223f46d 100644 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/app/recharge/AppPhoneRecordController.java +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/app/recharge/AppPhoneRecordController.java @@ -1,16 +1,21 @@ package cn.iocoder.yudao.module.shop.controller.app.recharge; +import cn.hutool.http.HttpRequest; import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; import cn.iocoder.yudao.module.shop.controller.admin.recharge.vo.*; +import cn.iocoder.yudao.module.shop.controller.app.recharge.vo.PhoneRecordAdd; import cn.iocoder.yudao.module.shop.convert.recharge.PhoneRecordConvert; import cn.iocoder.yudao.module.shop.dal.dataobject.recharge.PhoneRecordDO; import cn.iocoder.yudao.module.shop.service.recharge.PhoneRecordService; +import com.alibaba.fastjson.JSONObject; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Value; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -29,12 +34,46 @@ import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.E @RestController @RequestMapping("/shop/phone-record") @Validated +@Slf4j public class AppPhoneRecordController { @Resource private PhoneRecordService phoneRecordService; + @Value("${phone.query-url}") + private String phoneUrl; + + @Value("${phone.token}") + private String token; + @PostMapping("test") + public CommonResult test(@RequestBody List data){ + String result = HttpRequest.post(phoneUrl+"query/createReport") + .header("token",token) + .body(JSONObject.toJSONString(data)) + .execute() + .body(); + JSONObject resultJson = JSONObject.parseObject(result); + log.info("提报新增返回结果{}",JSONObject.toJSONString(resultJson)); + if("0000".equals(resultJson.get("code"))){ + return success(null); + } + return success(null); + } + @PostMapping("delete") + public CommonResult delete(@RequestBody List data){ + String result = HttpRequest.post(phoneUrl+"query/deleteReport") + .header("token",token) + .body(JSONObject.toJSONString(data)) + .execute() + .body(); + JSONObject resultJson = JSONObject.parseObject(result); + log.info("提报新增返回结果{}",JSONObject.toJSONString(resultJson)); + if("0000".equals(resultJson.get("code"))){ + return success(null); + } + return success(null); + } } diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/app/recharge/AppRefundFeeRecordController.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/app/recharge/AppRefundFeeRecordController.java index 2aef5212e..c3ad9e0c8 100644 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/app/recharge/AppRefundFeeRecordController.java +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/app/recharge/AppRefundFeeRecordController.java @@ -21,6 +21,7 @@ import com.alibaba.fastjson.JSONObject; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; @@ -40,6 +41,7 @@ import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.E @RestController @RequestMapping("/shop/refund-fee-record") @Validated +@Slf4j public class AppRefundFeeRecordController { @Resource @@ -66,6 +68,7 @@ public class AppRefundFeeRecordController { .execute() .body(); JSONObject resultJson = JSONObject.parseObject(result); + log.info("查询会员档次{}",resultJson); if("0000".equals(resultJson.get("code"))){ return success(resultJson.getJSONArray("body")); } @@ -85,6 +88,7 @@ public class AppRefundFeeRecordController { .execute() .body(); JSONObject resultJson = JSONObject.parseObject(result); + log.info("查询档位返费信息{}",resultJson); if("0000".equals(resultJson.get("code"))){ return success(resultJson.getJSONArray("body")); } diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/app/recharge/vo/PhoneRecordAdd.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/app/recharge/vo/PhoneRecordAdd.java new file mode 100644 index 000000000..a1f9f5a7e --- /dev/null +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/app/recharge/vo/PhoneRecordAdd.java @@ -0,0 +1,17 @@ +package cn.iocoder.yudao.module.shop.controller.app.recharge.vo; + + +import lombok.Data; + +import java.math.BigDecimal; +import java.time.LocalDateTime; + +@Data +public class PhoneRecordAdd { + private String phone; + private BigDecimal money; + private String gear; + private String orderTime; + private String channel; + private String orderNo; +} diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/StoreOrderServiceImpl.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/StoreOrderServiceImpl.java index dd6d60daa..7c7cba6a7 100644 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/StoreOrderServiceImpl.java +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/StoreOrderServiceImpl.java @@ -23,6 +23,7 @@ import cn.iocoder.yudao.module.member.api.user.MemberUserApi; import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO; import cn.iocoder.yudao.module.member.api.user.dto.PromoterDTO; import cn.iocoder.yudao.module.shop.controller.admin.recharge.vo.RechargeGearExportReqVO; +import cn.iocoder.yudao.module.shop.controller.app.recharge.vo.PhoneRecordAdd; import cn.iocoder.yudao.module.shop.dal.dataobject.express.ExpressDO; import cn.iocoder.yudao.module.shop.dal.dataobject.order.StoreOrder; import cn.iocoder.yudao.module.shop.dal.dataobject.recharge.PhoneRecordDO; @@ -1219,6 +1220,13 @@ public class StoreOrderServiceImpl extends ServiceImpl infoDOS = rechargeOrderInfoMapper.selectList(Wrappers.lambdaQuery().eq(RechargeOrderInfoDO::getOrderNo, orderId)); List recordDOS = new ArrayList<>(); + List phoneRecordAdds = new ArrayList<>(); + DeptRespDTO deptRespDTO = deptApi.getDept(orderDO.getDeptId()); infoDOS.forEach(info -> { + Long rechargeGearId = info.getRechargeGearId(); + RechargeGearDO rechargeGearDO = rechargeGearService.getRechargeGear(rechargeGearId.toString()); PhoneRecordDO phoneRecordDO = new PhoneRecordDO(); + PhoneRecordAdd phoneRecordAdd = new PhoneRecordAdd(); phoneRecordDO.setUserId(Long.valueOf(orderDO.getUid())); phoneRecordDO.setRechargeOrderId(Long.valueOf(orderDO.getId())); phoneRecordDO.setPhone(orderDO.getUserPhone()); @@ -1257,9 +1270,21 @@ public class StoreOrderServiceImpl extends ServiceImplDescription:删除档位信息 * @author: zenghuapei * @date: 2023/5/24 12:44 - * @param phone: - * @param gear: * @return * */ - Boolean deletePhoneGear(String phone, String gear); + Boolean deletePhoneGear(String orderId); /** * 
     * insertPhone
     * Description:新增档位信息
     * @author: zenghuapei
     * @date: 2023/5/24 12:45
-    * @param phone:
-     * @param gear:
     * @return
     *
*/ - Boolean insertPhone(String phone, String gear); + Boolean insertPhone(List data); } diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/PhoneRecordServiceImpl.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/PhoneRecordServiceImpl.java index 8295e57d3..984000c4e 100644 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/PhoneRecordServiceImpl.java +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/PhoneRecordServiceImpl.java @@ -6,8 +6,10 @@ import cn.iocoder.yudao.framework.common.exception.ServiceException; import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils; import cn.iocoder.yudao.module.member.api.user.MemberUserApi; import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO; +import cn.iocoder.yudao.module.shop.controller.app.recharge.vo.PhoneRecordAdd; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -32,6 +34,7 @@ import static cn.iocoder.yudao.module.shop.enums.ErrorCodeConstants.*; */ @Service @Validated +@Slf4j public class PhoneRecordServiceImpl implements PhoneRecordService { @Resource @@ -126,4 +129,54 @@ public class PhoneRecordServiceImpl implements PhoneRecordService { throw new ServiceException("手机号档位验证失败"); } } + + /** + * 
+     * deletePhoneGear
+     * Description:删除档位信息
+     * @author: zenghuapei
+     * @date: 2023/5/24 12:44
+     * @return
+     *
+ */ + @Override + public Boolean deletePhoneGear(String orderId) { + String result = HttpRequest.post(phoneUrl+"query/deleteReport") + .header("token",token) + .body(JSONObject.toJSONString(orderId)) + .execute() + .body(); + JSONObject resultJson = JSONObject.parseObject(result); + log.info("删除提报{}",JSONObject.toJSONString(resultJson)); + if("0000".equals(resultJson.get("code"))){ + return true; + } + return false; + } + + /** + * 
+     * insertPhone
+     * Description:新增档位信息
+     * @author: zenghuapei
+     * @date: 2023/5/24 12:45
+     * @return
+     *
+ * + * @param data + */ + @Override + public Boolean insertPhone(List data) { + String result = HttpRequest.post(phoneUrl+"query/createReport") + .header("token",token) + .body(JSONObject.toJSONString(data)) + .execute() + .body(); + JSONObject resultJson = JSONObject.parseObject(result); + log.info("提报新增返回结果{}",JSONObject.toJSONString(resultJson)); + if("0000".equals(resultJson.get("code"))){ + return true; + } + return false; + } } diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/RechargeGearServiceImpl.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/RechargeGearServiceImpl.java index 9e53955f4..5821a7322 100644 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/RechargeGearServiceImpl.java +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/RechargeGearServiceImpl.java @@ -87,7 +87,7 @@ public class RechargeGearServiceImpl implements RechargeGearService { } @Override - public List getRechargeGearList(Collection ids) { + public List getRechargeGearList(List ids) { return rechargeGearMapper.selectBatchIds(ids); }