nickchange
2023-10-20 562499071bf7814840467df81327277c7b8103fa
10.20.2
7个文件已修改
1个文件已添加
105 ■■■■■ 已修改文件
cloud-server-course/src/main/java/com/dsh/course/entity/OperatorUser.java 36 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-course/src/main/java/com/dsh/course/feignclient/other/StoreClient.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-other/src/main/java/com/dsh/other/controller/StoreController.java 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-other/src/main/java/com/dsh/other/mapper/StoreMapper.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-other/src/main/java/com/dsh/other/service/StoreService.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-other/src/main/java/com/dsh/other/service/impl/StoreServiceImpl.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-other/src/main/resources/mapper/StoreMapper.xml 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-course/src/main/java/com/dsh/course/entity/OperatorUser.java
New file
@@ -0,0 +1,36 @@
package com.dsh.course.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.math.BigDecimal;
@TableName("t_operator_user")
@Data
public class OperatorUser {
    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;
    @TableField(value = "userId")
    private Integer userId;
    @TableField(value = "alipay")
    private String alipay;
    @TableField(value = "alipayProportion")
    private String alipayProportion;
    @TableField(value = "alipayNum")
    private String alipayNum;
    @TableField(value = "wechat")
    private String wechat;
    @TableField(value = "wechatProportion")
    private String wechatProportion;
    @TableField(value = "wechatNum")
    private String wechatNum;
    @TableField(value = "alipayType")
    private Integer alipayType;
    @TableField(value = "wechatType")
    private Integer wechatType;
    @TableField(value = "operatorId")
    private Integer operatorId;
}
cloud-server-course/src/main/java/com/dsh/course/feignclient/other/StoreClient.java
@@ -1,5 +1,6 @@
package com.dsh.course.feignclient.other;
import com.dsh.course.entity.OperatorUser;
import com.dsh.course.feignclient.other.model.GetDistanceVo;
import com.dsh.course.feignclient.other.model.Store;
import org.springframework.cloud.openfeign.FeignClient;
@@ -38,4 +39,8 @@
    @PostMapping("/base/protocol/storeDetail/distanceCal")
    String calculateDistance(@RequestBody GetDistanceVo distanceVo);
    //查询运营商
    @PostMapping("/store/queryByStoreId")
    OperatorUser queryByStoreId(Integer storeId);
}
cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java
@@ -1009,6 +1009,8 @@
    }
    @Autowired
    private TCoursePackageService coursePackageService;
    public void moneyOut(String outNum,String tradeNo) throws AlipayApiException {
        AlipayClient alipayClient = new DefaultAlipayClient("https://openapi.alipay.com/gateway.do", aliAppid, appPrivateKey, "json", "UTF-8", alipay_public_key, "RSA2");
        AlipayTradeOrderSettleRequest request = new AlipayTradeOrderSettleRequest();
@@ -1050,12 +1052,31 @@
//        royaltyDetailInfos1.setAmountPercentage("100");
//        royaltyDetailInfos.add(royaltyDetailInfos1);
        TCoursePackagePayment one = coursePackagePaymentService.getOne(new QueryWrapper<TCoursePackagePayment>().eq("code", "outNum"));
        TCoursePackage byId = coursePackageService.getById(one.getCoursePackageId());
        OperatorUser operatorUser =  storeClient.queryByStoreId(byId.getStoreId());
//        Integer paymentCompetitions = competitionsClient.queryByCode(outTradeNo);
//        Integer siteBookings = siteClient.queryByCode(outTradeNo);
//        List<Integer> stores = new ArrayList<>();
//        stores.add(coursePackagePayments);
//        stores.add(paymentCompetitions);
//        stores.add(siteBookings);
//
//        OperatorUser operatorUser = siteClient.queryOperator(stores);
        OpenApiRoyaltyDetailInfoPojo op = new OpenApiRoyaltyDetailInfoPojo();
        op.setTransOutType("loginName");
        op.setTransOut("happysports@weparklife.com");
        op.setTransInType("userId");
        op.setTransIn("2088022313710050");
        op.setAmountPercentage(100L);
        op.setTransIn(operatorUser.getAlipayNum());
        op.setAmountPercentage(Long.valueOf(operatorUser.getAlipayProportion()));
        List<OpenApiRoyaltyDetailInfoPojo> ops = new ArrayList<>();
        ops.add(op);
cloud-server-other/src/main/java/com/dsh/other/controller/StoreController.java
@@ -3,10 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.dsh.other.entity.Store;
import com.dsh.other.entity.TBackRecord;
import com.dsh.other.entity.TStoreOther;
import com.dsh.other.entity.TStoreOtherConfigTrue;
import com.dsh.other.entity.*;
import com.dsh.other.feignclient.model.*;
import com.dsh.other.model.*;
import com.dsh.other.service.*;
@@ -304,6 +301,17 @@
        }
    }
    @ResponseBody
    @PostMapping("/store/queryByStoreId")
    public OperatorUser queryByStoreId(@RequestBody Integer id){
        try {
            return storeService.queryByStoreId(id);
        }catch (Exception e){
            e.printStackTrace();
            return null;
        }
    }
    @PostMapping("/store/addBackRecord")
    public void addBackRecord(@RequestBody String s){
cloud-server-other/src/main/java/com/dsh/other/mapper/StoreMapper.java
@@ -1,6 +1,7 @@
package com.dsh.other.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.dsh.other.entity.OperatorUser;
import com.dsh.other.entity.Store;
import com.dsh.other.model.BaseVo;
import com.dsh.other.model.ProvinceAndCityVo;
@@ -62,4 +63,5 @@
    List<Map<String, Object>> game(@Param("appUserId") Integer appUserId);
    OperatorUser queryByStoreId(@Param("id") Integer id);
}
cloud-server-other/src/main/java/com/dsh/other/service/StoreService.java
@@ -1,6 +1,7 @@
package com.dsh.other.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.dsh.other.entity.OperatorUser;
import com.dsh.other.entity.Store;
import com.dsh.other.model.BaseVo;
import com.dsh.other.model.ProvinceAndCityVo;
@@ -72,4 +73,6 @@
    String getOName(Integer operatorId);
    List<Map<String, Object>> game(Integer appUserId);
    OperatorUser queryByStoreId(Integer id);
}
cloud-server-other/src/main/java/com/dsh/other/service/impl/StoreServiceImpl.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.dsh.other.entity.OperatorUser;
import com.dsh.other.entity.Store;
import com.dsh.other.mapper.StoreMapper;
import com.dsh.other.model.BaseVo;
@@ -65,6 +66,11 @@
        return this.baseMapper.game(appUserId);
    }
    @Override
    public OperatorUser queryByStoreId(Integer id) {
        return this.baseMapper.queryByStoreId(id);
    }
    /**
     * 获取列表数据
cloud-server-other/src/main/resources/mapper/StoreMapper.xml
@@ -31,4 +31,16 @@
    <select id="game" resultType="java.util.Map">
        select time,money from t_game_record where userId =#{appUserId} and payType =3
    </select>
    <select id="queryByStoreId" resultType="com.dsh.other.entity.OperatorUser">
        SELECT * from t_operator_user WHERE operatorId =
                                            (SELECT ts.operatorId
                                             from t_store ts
                                             WHERE ts.id = #{id})
    </select>
</mapper>