支付+优惠码

src/main/java/com/szwl/controller/TOrderController.java

@@ -22,10 +22,7 @@ import com.szwl.model.entity.*;
 import com.szwl.model.query.TAdminParam;
 import com.szwl.model.utils.JoinpayConstant;
 import com.szwl.model.utils.PushUtils;
-import com.szwl.service.TEquipmentService;
-import com.szwl.service.TJoinpayMchService;
-import com.szwl.service.TOrderService;
-import com.szwl.service.TShandeMchService;
+import com.szwl.service.*;
 import com.szwl.service.es.EsTOrderService;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang.StringUtils;
@@ -68,6 +65,8 @@ public class TOrderController {
     TEquipmentService equipmentService;
     @Autowired
     EsTOrderService esTOrderService;
+    @Autowired
+    TSzsmWxService szsmWxService;
     @ApiOperation(value = "测试feign")
     @GetMapping("/testFeign")
     public ResponseModel<?> testFeign(String id) {
@@ -1998,7 +1997,7 @@ public class TOrderController {
                 note.append(productNamea).append(num).append(":");
                 productName1.append(productNamea).append(num);
                 //确定价格，然后叠加R.getDataIfSuccess(szwlFeign.getProduct(String.valueOf(equipmentId), productName));
-                TProduct product = R.getDataIfSuccess(szwlFeign.getProduct(String.valueOf(equipment.getId()), productName.toString()));
+                TProduct product = R.getDataIfSuccess(szwlFeign.getProduct(String.valueOf(equipment.getId()), productNamea.toString()));
                 if (product == null) {
                     return JsonMessage.error("找不到商品");
                 }
@@ -2038,7 +2037,7 @@ public class TOrderController {
                 String[] productNum = key.split("-");
                 String productNamea = productNum[0];
                 String num = productNum[1];
-                TProduct product = R.getDataIfSuccess(szwlFeign.getProduct(String.valueOf(equipment.getId()), productName.toString()));
+                TProduct product = R.getDataIfSuccess(szwlFeign.getProduct(String.valueOf(equipment.getId()), productNamea.toString()));
                 BigDecimal productPrice = product.getRmbPrice();
                 productName.append(productNamea).append(num);
                 productName1.append(productNamea).append(num);
@@ -2089,10 +2088,10 @@ public class TOrderController {
 
         Long equipmentId = equipment.getId();
         //查找商品
-        TProduct product =  R.getDataIfSuccess(szwlFeign.getProduct(String.valueOf(equipmentId), productName.toString()));
-        if (product == null) {
-            return JsonMessage.error("找不到商品");
-        }
+//        TProduct product =  R.getDataIfSuccess(szwlFeign.getProduct(String.valueOf(equipmentId), productName.toString()));
+//        if (product == null) {
+//            return JsonMessage.error("找不到商品");
+//        }
 
         if (BigDecimal.ZERO.compareTo(price) >= 0) {
             return JsonMessage.error("商品价格异常");
@@ -2281,11 +2280,12 @@ public class TOrderController {
         String returnUrl = null;
         String notifyUrl = JoinpayConstant.Notify_Url;
         String isShowPic = "1";
-        String openId = null;
+        TSzsmWx szsmWx = szsmWxService.getById(id);
+        String openId = szsmWx.getOpenId();
         String authCode = null;
-        String appid = null;
+        String appid = "wx5071443e63295c29";
         String transactionModel = null;
-        String tradeMerchantNo = admin.getTradeMerchantNo();
+        String tradeMerchantNo = "777114600391409";
         String buyerId = null;
         String isAlt = "1";
         String altType = "11";
@@ -2299,8 +2299,8 @@ public class TOrderController {
         order.setModifyDate(new Date());
         order.setAdminId(admin.getId());
         order.setSn(sn1);
-        order.setProductId(product.getId());
-        order.setProductNo(product.getNo());
+//        order.setProductId(product.getId());
+//        order.setProductNo(product.getNo());
         order.setProductName(productName.toString());
         order.setPrice(price);
         order.setClientId(equipment.getClientId());

src/main/java/com/szwl/controller/TSzsmWxController.java

@@ -0,0 +1,21 @@
+package com.szwl.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author wuhs
+ * @since 2022-10-23
+ */
+@RestController
+@RequestMapping("/tSzsmWx")
+public class TSzsmWxController {
+
+}
+

src/main/java/com/szwl/mapper/TSzsmWxMapper.java

@@ -0,0 +1,16 @@
+package com.szwl.mapper;
+
+import com.szwl.model.entity.TSzsmWx;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author wuhs
+ * @since 2022-10-23
+ */
+public interface TSzsmWxMapper extends BaseMapper<TSzsmWx> {
+
+}

src/main/java/com/szwl/mapper/xml/TSzsmWxMapper.xml

@@ -0,0 +1,22 @@
+<?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.szwl.mapper.TSzsmWxMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.szwl.model.entity.TSzsmWx">
+        <id column="id" property="id" />
+        <result column="open_id" property="openId" />
+        <result column="create_date" property="createDate" />
+        <result column="modify_date" property="modifyDate" />
+        <result column="phone" property="phone" />
+        <result column="nick_name" property="nickName" />
+        <result column="avatar_url" property="avatarUrl" />
+        <result column="integral" property="integral" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, open_id, create_date, modify_date, phone, nick_name, avatar_url, integral
+    </sql>
+
+</mapper>

src/main/java/com/szwl/model/entity/TSzsmWx.java

@@ -0,0 +1,47 @@
+package com.szwl.model.entity;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author wuhs
+ * @since 2022-10-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="TSzsmWx对象", description="")
+public class TSzsmWx implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    private String openId;
+
+    private Date createDate;
+
+    private Date modifyDate;
+
+    private String phone;
+
+    private String nickName;
+
+    private String avatarUrl;
+
+    @ApiModelProperty(value = "积分")
+    private BigDecimal integral;
+
+
+}

src/main/java/com/szwl/service/TSzsmWxService.java

@@ -0,0 +1,16 @@
+package com.szwl.service;
+
+import com.szwl.model.entity.TSzsmWx;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author wuhs
+ * @since 2022-10-23
+ */
+public interface TSzsmWxService extends IService<TSzsmWx> {
+
+}

src/main/java/com/szwl/service/impl/TSzsmWxServiceImpl.java

@@ -0,0 +1,20 @@
+package com.szwl.service.impl;
+
+import com.szwl.model.entity.TSzsmWx;
+import com.szwl.mapper.TSzsmWxMapper;
+import com.szwl.service.TSzsmWxService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author wuhs
+ * @since 2022-10-23
+ */
+@Service
+public class TSzsmWxServiceImpl extends ServiceImpl<TSzsmWxMapper, TSzsmWx> implements TSzsmWxService {
+
+}

src/test/java/com/szwl/AutoGeneratorTests.java

@@ -39,7 +39,7 @@ class AutoGeneratorTests {
 		//配置数据源
 		DataSourceConfig dataSourceConfig = new DataSourceConfig();
 		dataSourceConfig.setDriverName("com.mysql.cj.jdbc.Driver")
-				.setUrl("jdbc:mysql://rm-wz995mu26a1479kz0so.mysql.rds.aliyuncs.com:3306/orderdb")
+				.setUrl("jdbc:mysql://rm-wz995mu26a1479kz0so.mysql.rds.aliyuncs.com:3306/orderdb-test")
 				.setUsername("root").setPassword("sunzee@020");
 
 		//策略配置