fix 分销

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/OrderShareMoneyAddBo.java

@@ -0,0 +1,40 @@
+package com.zhongzheng.modules.order.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+import java.math.BigDecimal;
+
+/**
+ * 订单分销返利钱添加对象 order_share_money
+ *
+ * @author hjl
+ * @date 2022-11-18
+ */
+@Data
+@ApiModel("订单分销返利钱添加对象")
+public class OrderShareMoneyAddBo {
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long orderId;
+    /** 创建时间 */
+    @ApiModelProperty("创建时间")
+    private Long createTime;
+    /** 更新时间 */
+    @ApiModelProperty("更新时间")
+    private Long updateTime;
+    /** 0关闭返利 1返利 -1关闭 */
+    @ApiModelProperty("0关闭返利 1返利 -1关闭")
+    private Integer status;
+    /** 分销价格 */
+    @ApiModelProperty("分销价格")
+    private BigDecimal price;
+    /** 用户ID */
+    @ApiModelProperty("用户ID")
+    private Long userId;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/OrderShareMoneyEditBo.java

@@ -0,0 +1,46 @@
+package com.zhongzheng.modules.order.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+import java.math.BigDecimal;
+
+/**
+ * 订单分销返利钱编辑对象 order_share_money
+ *
+ * @author hjl
+ * @date 2022-11-18
+ */
+@Data
+@ApiModel("订单分销返利钱编辑对象")
+public class OrderShareMoneyEditBo {
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long id;
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long orderId;
+
+    /** 更新时间 */
+    @ApiModelProperty("更新时间")
+    private Long updateTime;
+
+    /** 0关闭返利 1返利 -1关闭 */
+    @ApiModelProperty("0关闭返利 1返利 -1关闭")
+    private Integer status;
+
+    /** 分销价格 */
+    @ApiModelProperty("分销价格")
+    private BigDecimal price;
+
+
+    /** 用户ID */
+    @ApiModelProperty("用户ID")
+    private Long userId;
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/OrderShareMoneyQueryBo.java

@@ -0,0 +1,52 @@
+package com.zhongzheng.modules.order.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+import java.util.Map;
+import java.util.HashMap;
+
+import java.math.BigDecimal;
+import com.zhongzheng.common.core.domain.BaseEntity;
+
+/**
+ * 订单分销返利钱分页查询对象 order_share_money
+ *
+ * @author hjl
+ * @date 2022-11-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("订单分销返利钱分页查询对象")
+public class OrderShareMoneyQueryBo extends BaseEntity {
+
+	/** 分页大小 */
+	@ApiModelProperty("分页大小")
+	private Integer pageSize;
+	/** 当前页数 */
+	@ApiModelProperty("当前页数")
+	private Integer pageNum;
+	/** 排序列 */
+	@ApiModelProperty("排序列")
+	private String orderByColumn;
+	/** 排序的方向desc或者asc */
+	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
+	private String isAsc;
+
+
+	/** $column.columnComment */
+	@ApiModelProperty("$column.columnComment")
+	private Long orderId;
+	/** 0关闭返利 1返利 -1关闭 */
+	@ApiModelProperty("0关闭返利 1返利 -1关闭")
+	private Integer status;
+	/** 分销价格 */
+	@ApiModelProperty("分销价格")
+	private BigDecimal price;
+	/** 用户ID */
+	@ApiModelProperty("用户ID")
+	private Long userId;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/domain/OrderShareMoney.java

@@ -0,0 +1,43 @@
+package com.zhongzheng.modules.order.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.zhongzheng.common.annotation.Excel;
+
+/**
+ * 订单分销返利钱对象 order_share_money
+ *
+ * @author hjl
+ * @date 2022-11-18
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("order_share_money")
+public class OrderShareMoney implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** $column.columnComment */
+    @TableId(value = "id")
+    private Long id;
+    /** $column.columnComment */
+    private Long orderId;
+    /** 创建时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+    /** 更新时间 */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateTime;
+    /** 0关闭返利 1返利 -1关闭 */
+    private Integer status;
+    /** 分销价格 */
+    private BigDecimal price;
+    /** 用户ID */
+    private Long userId;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/mapper/OrderShareMoneyMapper.java

@@ -0,0 +1,14 @@
+package com.zhongzheng.modules.order.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.order.domain.OrderShareMoney;
+
+/**
+ * 订单分销返利钱Mapper接口
+ *
+ * @author hjl
+ * @date 2022-11-18
+ */
+public interface OrderShareMoneyMapper extends BaseMapper<OrderShareMoney> {
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/IOrderShareMoneyService.java

@@ -0,0 +1,52 @@
+package com.zhongzheng.modules.order.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.modules.order.bo.OrderShareMoneyAddBo;
+import com.zhongzheng.modules.order.bo.OrderShareMoneyEditBo;
+import com.zhongzheng.modules.order.bo.OrderShareMoneyQueryBo;
+import com.zhongzheng.modules.order.domain.OrderShareMoney;
+import com.zhongzheng.modules.order.vo.OrderShareMoneyVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 订单分销返利钱Service接口
+ *
+ * @author hjl
+ * @date 2022-11-18
+ */
+public interface IOrderShareMoneyService extends IService<OrderShareMoney> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	OrderShareMoneyVo queryById(Long id);
+
+	/**
+	 * 查询列表
+	 */
+	List<OrderShareMoneyVo> queryList(OrderShareMoneyQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入订单分销返利钱
+	 * @param bo 订单分销返利钱新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(OrderShareMoneyAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改订单分销返利钱
+	 * @param bo 订单分销返利钱编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(OrderShareMoneyEditBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderGoodsRefundServiceImpl.java

@@ -17,17 +17,16 @@ import com.zhongzheng.modules.goods.service.IGoodsService;
 import com.zhongzheng.modules.goods.vo.GoodsVo;
 import com.zhongzheng.modules.grade.domain.ClassGradeUser;
 import com.zhongzheng.modules.grade.service.IClassGradeUserService;
-import com.zhongzheng.modules.order.bo.OrderGoodsQueryBo;
-import com.zhongzheng.modules.order.bo.OrderGoodsRefundAddBo;
-import com.zhongzheng.modules.order.bo.OrderGoodsRefundEditBo;
-import com.zhongzheng.modules.order.bo.OrderGoodsRefundQueryBo;
+import com.zhongzheng.modules.order.bo.*;
 import com.zhongzheng.modules.order.domain.Order;
 import com.zhongzheng.modules.order.domain.OrderGoods;
 import com.zhongzheng.modules.order.domain.OrderGoodsRefund;
+import com.zhongzheng.modules.order.domain.OrderShareMoney;
 import com.zhongzheng.modules.order.mapper.OrderGoodsRefundMapper;
 import com.zhongzheng.modules.order.service.IOrderGoodsRefundService;
 import com.zhongzheng.modules.order.service.IOrderGoodsService;
 import com.zhongzheng.modules.order.service.IOrderService;
+import com.zhongzheng.modules.order.service.IOrderShareMoneyService;
 import com.zhongzheng.modules.order.vo.OrderGoodsRefundVo;
 import com.zhongzheng.modules.order.vo.OrderGoodsVo;
 import com.zhongzheng.modules.order.vo.OrderShareGoodsVo;
@@ -84,6 +83,8 @@ public class OrderGoodsRefundServiceImpl extends ServiceImpl<OrderGoodsRefundMap
     private IUserExamGoodsService iUserExamGoodsService;
     @Autowired
     private IUserService iUserService;
+    @Autowired
+    private IOrderShareMoneyService iOrderShareMoneyService;
     @Value("${oldStudySys.shareCanclePath}")
     private String SHARE_CANCLE_PATH;
 
@@ -361,30 +362,42 @@ public class OrderGoodsRefundServiceImpl extends ServiceImpl<OrderGoodsRefundMap
      */
     public boolean shareClientCancelOldSys(Order order, OrderGoods orderGoods, BigDecimal refund_fee) {
         if (Validator.isNotEmpty(order)) {
-            UserVo user = iUserService.queryById(order.getUserId());
-            if(Validator.isNotEmpty(user.getShareCode())){
-                OrderShareToOldVo vo  = new OrderShareToOldVo();
-                vo.setOrderId(order.getOrderId());
-                vo.setCanceamount(refund_fee);
-                List<OrderShareGoodsVo> shareGoodsVoList = new ArrayList<>();
-                OrderShareGoodsVo shareGoodsVo = new OrderShareGoodsVo();
-                shareGoodsVo.setGoodsId(orderGoods.getGoodsId());
-                shareGoodsVoList.add(shareGoodsVo);
-                vo.setGoodsList(shareGoodsVoList);
-                //分销下单
-                Map<String, String> params = new HashMap<>();
-                Long nowTime = DateUtils.getNowTime();
-                String sign = ToolsUtils.EncoderByMd5(nowTime.toString()+"pubilc2022");
-                params.put("stamp", nowTime.toString());
-                params.put("sign", sign);
-                params.put("jsonstr", JSONObject.toJSONString(vo));
-                String respone = "";
-                try {
-                    respone = HttpUtils.postFormBody(SHARE_CANCLE_PATH, params);
-                } catch (IOException e) {
-                    throw new CustomException("同步请求错误"+e.getMessage());
+            OrderShareMoney shareMoney = iOrderShareMoneyService.getOne(new LambdaQueryWrapper<OrderShareMoney>()
+                    .eq(OrderShareMoney::getStatus, 1)
+                    .eq(OrderShareMoney::getOrderId, order.getOrderId())
+                    .last("limit 1"));
+            if(Validator.isNotEmpty(shareMoney)){
+                UserVo user = iUserService.queryById(order.getUserId());
+                if(Validator.isNotEmpty(user.getShareCode())){
+                    OrderShareToOldVo vo  = new OrderShareToOldVo();
+                    vo.setOrderId(order.getOrderId());
+                    vo.setCanceamount(refund_fee);
+                    List<OrderShareGoodsVo> shareGoodsVoList = new ArrayList<>();
+                    OrderShareGoodsVo shareGoodsVo = new OrderShareGoodsVo();
+                    shareGoodsVo.setGoodsId(orderGoods.getGoodsId());
+                    shareGoodsVoList.add(shareGoodsVo);
+                    vo.setGoodsList(shareGoodsVoList);
+                    //分销下单
+                    Map<String, String> params = new HashMap<>();
+                    Long nowTime = DateUtils.getNowTime();
+                    String sign = ToolsUtils.EncoderByMd5(nowTime.toString()+"pubilc2022");
+                    params.put("stamp", nowTime.toString());
+                    params.put("sign", sign);
+                    params.put("jsonstr", JSONObject.toJSONString(vo));
+                    String respone = "";
+                    try {
+                        respone = HttpUtils.postFormBody(SHARE_CANCLE_PATH, params);
+                        OrderShareMoneyAddBo addBo = new OrderShareMoneyAddBo();
+                        addBo.setOrderId(order.getOrderId());
+                        addBo.setUserId(order.getUserId());
+                        addBo.setStatus(0);
+                        addBo.setPrice(refund_fee);
+                        iOrderShareMoneyService.insertByAddBo(addBo);
+                    } catch (IOException e) {
+                        throw new CustomException("同步请求错误"+e.getMessage());
+                    }
+                    return true;
                 }
-                return true;
             }
         }
         return false;

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderShareMoneyServiceImpl.java

@@ -0,0 +1,103 @@
+package com.zhongzheng.modules.order.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.modules.order.bo.OrderShareMoneyAddBo;
+import com.zhongzheng.modules.order.bo.OrderShareMoneyEditBo;
+import com.zhongzheng.modules.order.bo.OrderShareMoneyQueryBo;
+import com.zhongzheng.modules.order.domain.OrderShareMoney;
+import com.zhongzheng.modules.order.mapper.OrderShareMoneyMapper;
+import com.zhongzheng.modules.order.service.IOrderShareMoneyService;
+import com.zhongzheng.modules.order.vo.OrderShareMoneyVo;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.pagehelper.Page;
+
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 订单分销返利钱Service业务层处理
+ *
+ * @author hjl
+ * @date 2022-11-18
+ */
+@Service
+public class OrderShareMoneyServiceImpl extends ServiceImpl<OrderShareMoneyMapper, OrderShareMoney> implements IOrderShareMoneyService {
+
+    @Override
+    public OrderShareMoneyVo queryById(Long id){
+        OrderShareMoney db = this.baseMapper.selectById(id);
+        return BeanUtil.toBean(db, OrderShareMoneyVo.class);
+    }
+
+    @Override
+    public List<OrderShareMoneyVo> queryList(OrderShareMoneyQueryBo bo) {
+        LambdaQueryWrapper<OrderShareMoney> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getOrderId() != null, OrderShareMoney::getOrderId, bo.getOrderId());
+        lqw.eq(bo.getStatus() != null, OrderShareMoney::getStatus, bo.getStatus());
+        lqw.eq(bo.getPrice() != null, OrderShareMoney::getPrice, bo.getPrice());
+        lqw.eq(bo.getUserId() != null, OrderShareMoney::getUserId, bo.getUserId());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<OrderShareMoneyVo> entity2Vo(Collection<OrderShareMoney> collection) {
+        List<OrderShareMoneyVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, OrderShareMoneyVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<OrderShareMoney> page = (Page<OrderShareMoney>)collection;
+            Page<OrderShareMoneyVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(OrderShareMoneyAddBo bo) {
+        OrderShareMoney add = BeanUtil.toBean(bo, OrderShareMoney.class);
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(OrderShareMoneyEditBo bo) {
+        OrderShareMoney update = BeanUtil.toBean(bo, OrderShareMoney.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(DateUtils.getNowTime());
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(OrderShareMoney entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return this.removeByIds(ids);
+    }
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/vo/OrderShareMoneyVo.java

@@ -0,0 +1,44 @@
+package com.zhongzheng.modules.order.vo;
+
+import com.zhongzheng.common.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.math.BigDecimal;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 订单分销返利钱视图对象 mall_package
+ *
+ * @author hjl
+ * @date 2022-11-18
+ */
+@Data
+@ApiModel("订单分销返利钱视图对象")
+public class OrderShareMoneyVo {
+	private static final long serialVersionUID = 1L;
+
+	/** $pkColumn.columnComment */
+	@ApiModelProperty("$pkColumn.columnComment")
+	private Long id;
+
+	/** $column.columnComment */
+	@Excel(name = "${comment}" , readConverterExp = "$column.readConverterExp()")
+	@ApiModelProperty("$column.columnComment")
+	private Long orderId;
+	/** 0关闭返利 1返利 -1关闭 */
+	@Excel(name = "0关闭返利 1返利 -1关闭")
+	@ApiModelProperty("0关闭返利 1返利 -1关闭")
+	private Integer status;
+	/** 分销价格 */
+	@Excel(name = "分销价格")
+	@ApiModelProperty("分销价格")
+	private BigDecimal price;
+	/** 用户ID */
+	@Excel(name = "用户ID")
+	@ApiModelProperty("用户ID")
+	private Long userId;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/wx/service/impl/WxPayServiceImpl.java

@@ -41,12 +41,14 @@ import com.zhongzheng.modules.grade.service.IClassGradeUserService;
 import com.zhongzheng.modules.grade.service.IClassGradeUserTempService;
 import com.zhongzheng.modules.grade.service.IStudyCountLogService;
 import com.zhongzheng.modules.order.bo.OrderGoodsQueryBo;
+import com.zhongzheng.modules.order.bo.OrderShareMoneyAddBo;
 import com.zhongzheng.modules.order.domain.Order;
 import com.zhongzheng.modules.order.domain.OrderGoods;
 import com.zhongzheng.modules.order.domain.OrderPay;
 import com.zhongzheng.modules.order.service.IOrderGoodsService;
 import com.zhongzheng.modules.order.service.IOrderPayService;
 import com.zhongzheng.modules.order.service.IOrderService;
+import com.zhongzheng.modules.order.service.IOrderShareMoneyService;
 import com.zhongzheng.modules.order.vo.OrderGoodsVo;
 import com.zhongzheng.modules.order.vo.OrderShareGoodsVo;
 import com.zhongzheng.modules.order.vo.OrderShareToOldVo;
@@ -170,6 +172,9 @@ public class WxPayServiceImpl implements IWxPayService {
     @Autowired
     private IUserMockSubscribeService iUserMockSubscribeService;
 
+    @Autowired
+    private IOrderShareMoneyService iOrderShareMoneyService;
+
     private String gzh_tokenUrl = "https://api.weixin.qq.com/cgi-bin/token";
 
     private String gzh_tokenParam = "grant_type=client_credential&appid=%s&secret=%s";
@@ -495,6 +500,12 @@ public class WxPayServiceImpl implements IWxPayService {
                 String respone = "";
                 try {
                     respone = HttpUtils.postFormBody(SHARE_PATH, params);
+                    OrderShareMoneyAddBo addBo = new OrderShareMoneyAddBo();
+                    addBo.setOrderId(order.getOrderId());
+                    addBo.setUserId(order.getUserId());
+                    addBo.setStatus(1);
+                    addBo.setPrice(order.getPayPrice());
+                    iOrderShareMoneyService.insertByAddBo(addBo);
                 } catch (IOException e) {
                     throw new CustomException("同步请求错误"+e.getMessage());
                 }

zhongzheng-system/src/main/resources/mapper/modules/order/OrderShareMoneyMapper.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zhongzheng.modules.order.mapper.OrderShareMoneyMapper">
+
+    <resultMap type="com.zhongzheng.modules.order.domain.OrderShareMoney" id="OrderShareMoneyResult">
+        <result property="id" column="id"/>
+        <result property="orderId" column="order_id"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="status" column="status"/>
+        <result property="price" column="price"/>
+        <result property="userId" column="user_id"/>
+    </resultMap>
+
+
+</mapper>