Merge branch 'develop' into release

tuoheng-api/src/main/java/com/tuoheng/api/entity/request/WxSubUserPointsRequest.java

@@ -21,4 +21,9 @@ public class WxSubUserPointsRequest {
     @NotNull(message = "points can not be null")
     private Integer points;
 
+    /**
+     * 商铺名称
+     */
+    private String shopName;
+
 }

tuoheng-api/src/main/java/com/tuoheng/api/service/impl/WxServiceImpl.java

@@ -121,6 +121,7 @@ public class WxServiceImpl implements IWxService {
         userPointsDetail.setOpenid(westreamUser.getOpenid());
         userPointsDetail.setNickname(westreamUser.getNickname());
         userPointsDetail.setPointsChange(wxSubUserPointsRequest.getPoints());
+        userPointsDetail.setOperatorName(wxSubUserPointsRequest.getShopName());
         userPointsDetail.setChangeName("积分兑换");
         userPointsDetail.setPointsTime(new Date());
         userPointsDetail.setType(2);
@@ -162,6 +163,7 @@ public class WxServiceImpl implements IWxService {
         userPointsDetail.setOpenid(westreamUser.getOpenid());
         userPointsDetail.setNickname(westreamUser.getNickname());
         userPointsDetail.setPointsChange(wxSubUserPointsRequest.getPoints());
+        userPointsDetail.setOperatorName(wxSubUserPointsRequest.getShopName());
         userPointsDetail.setChangeName("积分返还");
         userPointsDetail.setPointsTime(new Date());
         userPointsDetail.setType(1);