Merge remote-tracking branch 'origin/mp-server-test' into mp-server-test

mp-admin/src/main/java/com/qs/mp/web/controller/api/admin/CouponMgrController.java

@@ -45,6 +45,7 @@ import io.swagger.annotations.ApiResponses;
 import ma.glasnost.orika.MapperFacade;
 
 import java.math.BigDecimal;
+import java.net.URLDecoder;
 import java.util.*;
 import java.util.stream.Collector;
 import java.util.stream.Collectors;
@@ -231,6 +232,8 @@ public class CouponMgrController extends BaseApiController {
             }
         }
         Coupon coupon = mapperFacade.map(couponParam, Coupon.class);
+        String couponDetail = URLDecoder.decode(couponParam.getCouponDetail());
+        coupon.setCouponDetail(couponDetail);
         // 1、校验名称是否重复（代金券表）
         LambdaQueryWrapper<Coupon> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(Coupon::getTitle, coupon.getTitle());
@@ -287,6 +290,8 @@ public class CouponMgrController extends BaseApiController {
             }
         }
         Coupon coupon = mapperFacade.map(couponParam, Coupon.class);
+        String couponDetail = URLDecoder.decode(couponParam.getCouponDetail());
+        coupon.setCouponDetail(couponDetail);
         // 1、校验修改代金券是否为当前用户的代金券
         Coupon oldCoupon = couponService.getById(coupon.getCouponId());
         if (null == oldCoupon || null == oldCoupon.getCouponId()) {

mp-admin/src/main/java/com/qs/mp/web/controller/api/user/UserMineController.java

@@ -308,8 +308,6 @@ public class UserMineController extends BaseApiController {
 
         // 校验受赠人信息
         SysUser toUser = userService.selectUserByPhoneNumber(coinTransferParam.getPhone());
-
-        // 查询转赠人信息
         if (Objects.isNull(toUser)) {
             return AjaxResult.error("未查询到受赠用户");
         }
@@ -317,16 +315,15 @@ public class UserMineController extends BaseApiController {
             return AjaxResult.error("不能转赠给自己");
         }
 
+        SysUser fromUser = userService.selectUserById(fromUserId);
         CoinTransferParamDTO coinTransferParamDTO = new CoinTransferParamDTO();
         coinTransferParamDTO.setFromUserId(fromUserId);
         coinTransferParamDTO.setToUserId(toUser.getUserId());
-        coinTransferParamDTO.setToPhone(toUser.getPhonenumber());
-        coinTransferParamDTO.setFromPhone(coinTransferParam.getPhone());
+        coinTransferParamDTO.setToPhone(coinTransferParam.getPhone());
+        coinTransferParamDTO.setFromPhone(fromUser.getPhonenumber());
         coinTransferParamDTO.setRealTransferCoin(coinTransferParam.getTransferCoin() - 10);
         coinTransferParamDTO.setDeductTransferCoin(10);
 
-
-
         // 转赠盲豆
         boolean flag = userCoinService.transfer(coinTransferParamDTO);
 

mp-admin/src/main/resources/application-test.yml

@@ -1,9 +1,9 @@
 mp:
   profile: /home/mangpiao/mp-server
 pay:
-  callbackUrl: https://test-api.kaimanghe.net/service/notify/payCallback
+  callbackUrl: https://test-mp-adm.kaimanghe.net/service/notify/payCallback
 alipay:
-  callbackUrl: https://test-api.kaimanghe.net/service/notify/alipayCallback
+  callbackUrl: https://test-mp-adm.kaimanghe.net/service/notify/alipayCallback
 
 # 日志配置
 logging:
@@ -112,12 +112,12 @@ client:
 # cloud
 cloud:
   # 存储对象公开可访问
-  public-bucket-name: mp-public-test-1307117429
+  public-bucket-name: mp-public-test-1309783959
   # 存储对象公开不可访问，需要通过应用下载
-  private-bucket-name: mp-auth-test-1307117429
+  private-bucket-name: mp-auth-test-1309783959
 
-  accessKey: AKIDDF4dwzlGVTAmCMGvLVP4UfbHiuqVzFEw
-  secretKey: TgbFcjZ8HDse9ToujIabLo1yf5YqtfBX
+  accessKey: AKIDue8LHwKSJsBDySgdJjslNilY4JHyOXPz
+  secretKey: SdXAWbPwDDvMXR5SYOxtYw3sQhhQs2wZ
   region: ap-shanghai
 
 # 注释mq
@@ -152,11 +152,11 @@ ys-pay:
   private-key-path: /home/mangpiao/mp-server/data/ysPayPre.pfx
   public-key-path: /home/mangpiao/mp-server/data/businessgate.cer
   # 支付完后跳转
-  return-url: https://test-api.kaimanghe.net
+  return-url: https://test-mp-adm.kaimanghe.net
   # 回调地址
-  pay-notify-url: https://test-api.kaimanghe.net/service/notify/ysCallback
+  pay-notify-url: https://test-mp-adm.kaimanghe.net/service/notify/ysCallback
   # 分账回调地址
-  div-notify-url: https://test-api.kaimanghe.net/service/notify/ysDivCallback
+  div-notify-url: https://test-mp-adm.kaimanghe.net/service/notify/ysDivCallback
   # 提现回调地址
-  withdraw-notify-url: https://test-api.kaimanghe.net/service/notify/ysWithdrawCallback
+  withdraw-notify-url: https://test-mp-adm.kaimanghe.net/service/notify/ysWithdrawCallback
 

mp-admin/src/main/resources/logback-8091.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
     <!-- 日志存放路径 -->
-	<property name="log.path" value="/home/mangpiao/mp-server"/>
+	<property name="log.path" value="/home/quanshu/mp-server"/>
     <!-- 日志输出格式 -->
     <!-- You can override this to have a custom pattern -->
 	<property name="CONSOLE_LOG_PATTERN" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />

mp-service/src/main/java/com/qs/mp/admin/domain/Coupon.java

@@ -185,5 +185,11 @@ public class Coupon implements Serializable {
     @TableField("updated_time")
     private Date updatedTime;
 
+    /**
+     * 优惠卷详情
+     */
+    @TableField("coupon_detail")
+    private String couponDetail;
+
 
 }

mp-service/src/main/java/com/qs/mp/admin/domain/TicketAwardsPrize.java

@@ -139,4 +139,10 @@ public class TicketAwardsPrize implements Serializable {
     @TableField(exist = false)
     private Integer cost;
 
+    /**
+     * 优惠卷详情
+     */
+    @ApiModelProperty("优惠卷详情")
+    @TableField("coupon_detail")
+    private String couponDetail;
 }

mp-service/src/main/java/com/qs/mp/admin/domain/param/CouponParam.java

@@ -121,4 +121,7 @@ public class CouponParam {
   @ApiModelProperty("是否新用户注册发放:0否,1是")
   private Integer isNewUserCoupon;
 
+  @ApiModelProperty(value = "优惠卷详情")
+  private String couponDetail;
+
 }

mp-service/src/main/java/com/qs/mp/admin/domain/vo/CouponVO.java

@@ -175,5 +175,8 @@ public class CouponVO {
     @ApiModelProperty("更新时间")
     private Date updatedTime;
 
+    @ApiModelProperty(value = "优惠卷详情", required = false)
+    private String couponDetail;
+
 
 }

mp-service/src/main/java/com/qs/mp/user/service/impl/UserCoinServiceImpl.java

@@ -121,7 +121,7 @@ public class UserCoinServiceImpl extends ServiceImpl<UserCoinMapper, UserCoin> i
       userCoinFromLog.setMoney(userCoin.getCoin() - (coinTransferParamDTO.getRealTransferCoin() + coinTransferParamDTO.getDeductTransferCoin()));
       userCoinFromLog.setLogMoney(-(coinTransferParamDTO.getRealTransferCoin() + coinTransferParamDTO.getDeductTransferCoin()));
       userCoinFromLog.setIncomeExpense(CoinLogTypeEnum.EXPENSES);
-      userCoinFromLog.setLogText("盲豆转赠:(" + coinTransferParamDTO.getFromPhone() + ")" + ",转赠折损:" + coinTransferParamDTO.getDeductTransferCoin() + "盲豆");
+      userCoinFromLog.setLogText("盲豆转赠：(" + coinTransferParamDTO.getToPhone() + ")" + "｜转赠折损：" + coinTransferParamDTO.getDeductTransferCoin() + "盲豆");
       userCoinFromLog.setBizTime(new Date());
       userCoinFromLog.setCreatedTime(new Date());
       userCoinFromLog.setUpdatedTime(new Date());
@@ -133,7 +133,7 @@ public class UserCoinServiceImpl extends ServiceImpl<UserCoinMapper, UserCoin> i
       userCoinToLog.setMoney(toUserCoin.getCoin() + coinTransferParamDTO.getRealTransferCoin());
       userCoinToLog.setLogMoney(coinTransferParamDTO.getRealTransferCoin());
       userCoinToLog.setIncomeExpense(CoinLogTypeEnum.INCOME);
-      userCoinToLog.setLogText("盲豆转赠:(" + coinTransferParamDTO.getFromPhone() + ")");
+      userCoinToLog.setLogText("盲豆转赠：(" + coinTransferParamDTO.getFromPhone() + ")");
       userCoinToLog.setBizTime(new Date());
       userCoinToLog.setCreatedTime(new Date());
       userCoinToLog.setUpdatedTime(new Date());

mp-service/src/main/resources/mapper/admin/TicketAwardsPrizeMapper.xml

@@ -66,6 +66,8 @@
                 when 'goods' then if(t2.cost is not null, t2.cost, 0)
                 else 0
             end as cost,
+
+            if(t3.coupon_detail is not null, t3.coupon_detail, '') as coupon_detail,
             t1.*
         from mp_ticket_awards_prize t1
             left join mp_goods t2 on t1.ref_id = t2.goods_id