ygp-->mp

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

@@ -25,7 +25,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 @Api("短信验证码服务")
 @RestController
-@RequestMapping("/api/v1/ygp/*")
+@RequestMapping("/api/v1/mp/*")
 @Component
 public class SmsController extends BaseApiController {
 

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

@@ -45,9 +45,9 @@ import org.springframework.web.bind.annotation.RestController;
  * @describe
  */
 
-@Api("商户钱包API")
+@Api("用户钱包API")
 @RestController
-@RequestMapping("/api/v1/ygp")
+@RequestMapping("/api/v1/qs")
 @Component
 public class UserController extends BaseApiController {
 

mp-admin/src/main/java/com/qs/mp/web/controller/common/FileUploadController.java

@@ -28,7 +28,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
-@RequestMapping("/api/v1/ygp/*")
+@RequestMapping("/api/v1/mp/*")
 @RestController
 @Component
 public class FileUploadController extends BaseApiController {

mp-common/src/main/java/com/qs/mp/common/enums/UserIdentityEnum.java

@@ -11,6 +11,9 @@ public enum UserIdentityEnum {
 	CHANNEL, // 代理渠道
 	SALESITE // 经销商
 	;
+	public static boolean isChannel(UserIdentityEnum identity) {
+		return identity == CHANNEL || identity == SALESITE;
+	}
 
 	public static UserIdentityEnum valueOf(int ordinal) {
 		if (ordinal < 0 || ordinal >= values().length) {

mp-framework/src/main/java/com/qs/mp/framework/config/SecurityConfig.java

@@ -21,7 +21,7 @@ import org.springframework.web.filter.CorsFilter;
 
 /**
  * spring security配置
- * 
+ *
  * @author ygp
  */
 @EnableGlobalMethodSecurity(prePostEnabled = true, securedEnabled = true)
@@ -32,7 +32,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
      */
     @Autowired
     private UserDetailsService userDetailsService;
-    
+
     /**
      * 认证失败处理类
      */
@@ -59,7 +59,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
      */
     @Autowired
     private CorsFilter corsFilter;
-    
+
     /**
      * 解决 无法直接注入 AuthenticationManager
      *
@@ -106,7 +106,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                     "/captchaImage",
                     "/auth/mobile",
                     "/wxlogin",
-                    "/api/v1/ygp/sms/sendSmsCode").anonymous()
+                    "/api/v1/mp/sms/sendSmsCode").anonymous()
                 .antMatchers(
                         HttpMethod.GET,
                         "/",

mp-framework/src/main/java/com/qs/mp/framework/web/service/SysLoginService.java

@@ -34,7 +34,7 @@ import org.springframework.stereotype.Component;
 
 /**
  * 登录校验方法
- * 
+ *
  * @author ygp
  */
 @Component
@@ -51,19 +51,19 @@ public class SysLoginService
 
     @Autowired
     private RedisCache redisCache;
-    
+
     @Autowired
     private ISysUserService userService;
 
     @Autowired
     private ISysConfigService configService;
-    
+
     @Autowired
     private IChannelService channelService;
 
     /**
      * 登录验证
-     * 
+     *
      * @param username 用户名
      * @param password 密码
      * @param code 验证码
@@ -98,9 +98,11 @@ public class SysLoginService
         AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success")));
         LoginUser loginUser = (LoginUser) authentication.getPrincipal();
         recordLoginInfo(loginUser.getUser());
-        
-        // loginUser.setIdentity(UserIdentityEnum.valueOf(identity));
-        fillChannelInfo(loginUser);
+
+        loginUser.setIdentity(UserIdentityEnum.valueOf(identity));
+        if (UserIdentityEnum.isChannel(loginUser.getIdentity())) {
+            fillChannelInfo(loginUser);
+        }
 /*
         // 根据用户身份，设置对应的属性
         loginUser.setIdentity(UserIdentityEnum.valueOf(identity));
@@ -114,10 +116,10 @@ public class SysLoginService
         // 生成token
         return tokenService.createToken(loginUser);
     }
-    
+
     /**
      * 登录验证
-     * 
+     *
      * @param username 用户名
      * @param code 验证码
      * @param uuid 唯一标识
@@ -128,7 +130,7 @@ public class SysLoginService
     {
         // 校验短信验证码
         validateSMSCaptcha(username, code, uuid);
-        
+
         // 用户验证
         Authentication authentication = null;
         try
@@ -153,9 +155,11 @@ public class SysLoginService
         AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success")));
         LoginUser loginUser = (LoginUser) authentication.getPrincipal();
         recordLoginInfo(loginUser.getUser());
-        
-        // loginUser.setIdentity(UserIdentityEnum.valueOf(identity));
-        fillChannelInfo(loginUser);
+
+        loginUser.setIdentity(UserIdentityEnum.valueOf(identity));
+        if (UserIdentityEnum.isChannel(loginUser.getIdentity())) {
+            fillChannelInfo(loginUser);
+        }
 /*
         // 根据用户身份，设置对应的属性
         loginUser.setIdentity(UserIdentityEnum.valueOf(identity));
@@ -198,8 +202,11 @@ public class SysLoginService
         AsyncManager.me().execute(AsyncFactory.recordLogininfor(smsCode.getMobile(), Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success")));
         LoginUser loginUser = (LoginUser) authentication.getPrincipal();
         recordLoginInfo(loginUser.getUser());
-        
-        fillChannelInfo(loginUser);
+
+        loginUser.setIdentity(UserIdentityEnum.valueOf(smsCode.getIdentity()));
+        if (UserIdentityEnum.isChannel(loginUser.getIdentity())) {
+            fillChannelInfo(loginUser);
+        }
 /*
         // 根据用户身份，设置对应的属性
         loginUser.setIdentity(UserIdentityEnum.valueOf(smsCode.getIdentity()));
@@ -221,7 +228,7 @@ public class SysLoginService
 
     /**
      * 校验验证码
-     * 
+     *
      * @param username 用户名
      * @param code 验证码
      * @param uuid 唯一标识
@@ -243,10 +250,10 @@ public class SysLoginService
             throw new CaptchaException();
         }
     }
-    
+
     /**
      * 校验验证码
-     * 
+     *
      * @param username 用户名
      * @param code 短信验证码
      * @param uuid 唯一标识
@@ -278,7 +285,7 @@ public class SysLoginService
         user.setLoginDate(DateUtils.getNowDate());
         userService.updateUserProfile(user);
     }
-    
+
     /**
      * 填充注入Channel 渠道/经销商  信息
      * @param loginUser
@@ -286,12 +293,15 @@ public class SysLoginService
     public void fillChannelInfo(LoginUser loginUser){
     	Channel channel = channelService.getChannelByUserId(loginUser.getUserId());
         if (null != channel && null != channel.getId()){
-        	loginUser.setChannelId(channel.getId());
-        	loginUser.setChannelNo(channel.getChannelNo());
-        	if(null != channel.getLevel()) {
-        		loginUser.setIdentity(channel.getLevel().intValue() == 0?UserIdentityEnum.SALESITE:UserIdentityEnum.CHANNEL);
-        	}
-        } else if (loginUser.getUserId() != 1L){
+            // 校验渠道身份标识
+            if (loginUser.getIdentity() == UserIdentityEnum.CHANNEL && channel.getLevel() <= 0) {
+                throw new ServiceException("此账号的渠道不存在");
+            } else if (loginUser.getIdentity() == UserIdentityEnum.SALESITE && channel.getLevel() != 0) {
+                throw new ServiceException("此账号的经销商不存在");
+            }
+          loginUser.setChannelId(channel.getId());
+          loginUser.setChannelNo(channel.getChannelNo());
+        } else {
             throw new ServiceException("登录账号不存在");
         }
 

mp-generator/src/main/java/com/qs/mp/generator/DbGenerator.java

@@ -99,14 +99,6 @@ public class DbGenerator {
                                 moduleName + "/" + tableInfo.getEntityName() + "Mapper" + StringPool.DOT_XML;
                     }
                 });
-                /*fileOutConfigList.add(new FileOutConfig("templates-generator/controller.java.vm") {
-                    @Override
-                    public String outputFile(TableInfo tableInfo) {
-                        // 自定义输出文件名
-                        return projectPath + "/" + WEB_MODULAR_NAME + SRC_MAIN_JAVA + "com/qs/ygp/"  +
-                                moduleName + "/controller/" + tableInfo.getEntityName() + "Controller" + StringPool.DOT_JAVA;
-                    }
-                });*/
                 setFileOutConfigList(fileOutConfigList);
 
             }

mp-service/src/main/java/com/qs/mp/channel/domain/ChannelOrder.java

@@ -11,7 +11,7 @@ import lombok.Data;
 /**
  * @describe 经销商盲票采购订单实体类
  * @auther quanshu
- * @create 2022-02-28 22:54:23
+ * @create 2022-03-01 20:07:00
  */
 @TableName("mp_channel_order")
 @Data
@@ -31,12 +31,24 @@ public class ChannelOrder implements Serializable {
   @TableField("CHANNEL_ID")
   private Long channelId;
 
+  /**
+   * 标题
+   */
+  @TableField("TITLE")
+  private String title;
+
   /**
    * 订单金额
    */
   @TableField("ORDER_AMT")
   private Integer orderAmt;
 
+  /**
+   * 运费金额
+   */
+  @TableField("FREIGHT_AMT")
+  private Integer freightAmt;
+
   /**
    * 实付金额
    */
@@ -49,53 +61,59 @@ public class ChannelOrder implements Serializable {
   @TableField("STATUS")
   private String status;
 
+  /**
+   * 备注
+   */
+  @TableField("MEMO")
+  private String memo;
+
   /**
    * 收货人
    */
-  @TableField("RECEIVE_NAME")
-  private String receiveName;
+  @TableField("RECEIVER")
+  private String receiver;
 
   /**
    * 收货人电话
    */
-  @TableField("RECEIVE_TEL")
-  private String receiveTel;
+  @TableField("TEL")
+  private String tel;
 
   /**
    * 收货地址-省
    */
-  @TableField("RECEIVE_PROVINCE")
-  private String receiveProvince;
+  @TableField("PROVINCE")
+  private String province;
 
   /**
    * 收货地址-市
    */
-  @TableField("RECEIVE_CITY")
-  private String receiveCity;
+  @TableField("CITY")
+  private String city;
 
   /**
    * 收货地址-区
    */
-  @TableField("RECEIVE_AREA")
-  private String receiveArea;
+  @TableField("AREA")
+  private String area;
 
   /**
    * 收货地址-详细
    */
-  @TableField("RECEIVE_ADDR")
-  private String receiveAddr;
+  @TableField("ADDRESS")
+  private String address;
 
   /**
-   * 快递单号
+   * 物流ID
    */
-  @TableField("LOGISTICS_NO")
-  private String logisticsNo;
+  @TableField("DELIVERY_ID")
+  private String deliveryId;
 
   /**
-   * 快递品牌
+   * 物流单号
    */
-  @TableField("LOGISTICS_BRAND")
-  private String logisticsBrand;
+  @TableField("DELIVERY_FLOW_ID")
+  private String deliveryFlowId;
 
   /**
    * 创建时间
@@ -110,4 +128,4 @@ public class ChannelOrder implements Serializable {
   private Date updatedTime;
 
 
-}
+}

mp-service/src/main/java/com/qs/mp/channel/mapper/ChannelOrderMapper.java

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * @auther quanshu
- * @create 2022-02-28 22:54:23
+ * @create 2022-03-01 20:07:00
  * @describe 经销商盲票采购订单mapper类
  */
 public interface ChannelOrderMapper extends BaseMapper<ChannelOrder> {

mp-service/src/main/java/com/qs/mp/channel/service/IChannelOrderService.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * </p>
  *
  * @author quanshu
- * @since 2022-02-28
+ * @since 2022-03-01
  */
 public interface IChannelOrderService extends IService<ChannelOrder> {
 

mp-service/src/main/java/com/qs/mp/channel/service/impl/ChannelOrderServiceImpl.java

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
  * </p>
  *
  * @author quanshu
- * @since 2022-02-28
+ * @since 2022-03-01
  */
 @Service
 public class ChannelOrderServiceImpl extends ServiceImpl<ChannelOrderMapper, ChannelOrder> implements IChannelOrderService {

mp-service/src/main/java/com/qs/mp/manager/domain/TicketBox.java

@@ -12,7 +12,7 @@ import lombok.Data;
 /**
  * @describe 盲票组实体类
  * @auther quanshu
- * @create 2022-02-28 22:58:02
+ * @create 2022-03-01 20:33:52
  */
 @TableName("mp_ticket_box")
 @Data
@@ -38,18 +38,18 @@ public class TicketBox implements Serializable {
   @TableField("PIC_URL")
   private String picUrl;
 
-  /**
-   * 详细描述
-   */
-  @TableField("DESCRIPTION")
-  private String description;
-
   /**
    * 盲票类别
    */
   @TableField("CATEGORY")
   private String category;
 
+  /**
+   * 详细描述
+   */
+  @TableField("DESCRIPTION")
+  private String description;
+
   /**
    * 盲票形式（线上或线下）
    */
@@ -62,6 +62,12 @@ public class TicketBox implements Serializable {
   @TableField("QUANTITY")
   private Integer quantity;
 
+  /**
+   * 已售盲票张数
+   */
+  @TableField("SALE_QTY")
+  private Integer saleQty;
+
   /**
    * 盲票包采购单价
    */
@@ -83,8 +89,8 @@ public class TicketBox implements Serializable {
   /**
    * 已销售包数
    */
-  @TableField("SALES_QTY")
-  private Integer salesQty;
+  @TableField("SALE_PKG_QTY")
+  private Integer salePkgQty;
 
   /**
    * 盲票票面价格
@@ -104,6 +110,12 @@ public class TicketBox implements Serializable {
   @TableField("SALE_COMM_RATE")
   private BigDecimal saleCommRate;
 
+  /**
+   * 状态，上架/下架
+   */
+  @TableField("STATUS")
+  private String status;
+
   /**
    * 创建时间
    */

mp-service/src/main/java/com/qs/mp/manager/mapper/TicketBoxMapper.java

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * @auther quanshu
- * @create 2022-02-28 22:58:02
+ * @create 2022-03-01 20:33:52
  * @describe 盲票组mapper类
  */
 public interface TicketBoxMapper extends BaseMapper<TicketBox> {

mp-service/src/main/java/com/qs/mp/manager/service/ITicketBoxService.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * </p>
  *
  * @author quanshu
- * @since 2022-02-28
+ * @since 2022-03-01
  */
 public interface ITicketBoxService extends IService<TicketBox> {
 

mp-service/src/main/java/com/qs/mp/manager/service/impl/TicketBoxServiceImpl.java

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
  * </p>
  *
  * @author quanshu
- * @since 2022-02-28
+ * @since 2022-03-01
  */
 @Service
 public class TicketBoxServiceImpl extends ServiceImpl<TicketBoxMapper, TicketBox> implements ITicketBoxService {

mp-service/src/main/java/com/qs/mp/sms/domain/SmsCode.java

@@ -1,34 +1,17 @@
 package com.qs.mp.sms.domain;
 
+import com.qs.mp.common.enums.UserIdentityEnum;
 import lombok.Data;
 
+@Data
 public class SmsCode {
 
+  /**
+   * 登录身份{@link UserIdentityEnum}，渠道/经销商，默认是渠道
+   */
+  private int identity = 0;
+
   private String mobile;
   private String messageId;
   private String code;
-
-  public void setMobile(String mobile) {
-    this.mobile = mobile;
-  }
-
-  public void setMessageId(String messageId) {
-    this.messageId = messageId;
-  }
-
-  public void setCode(String code) {
-    this.code = code;
-  }
-
-  public String getMobile() {
-    return mobile;
-  }
-
-  public String getMessageId() {
-    return messageId;
-  }
-
-  public String getCode() {
-    return code;
-  }
 }

mp-service/src/main/resources/mapper/channel/ChannelOrderMapper.xml

@@ -6,24 +6,27 @@
     <resultMap id="BaseResultMap" type="com.qs.mp.channel.domain.ChannelOrder">
         <id column="ORDER_ID" property="orderId" />
         <result column="CHANNEL_ID" property="channelId" />
+        <result column="TITLE" property="title" />
         <result column="ORDER_AMT" property="orderAmt" />
+        <result column="FREIGHT_AMT" property="freightAmt" />
         <result column="PAY_AMT" property="payAmt" />
         <result column="STATUS" property="status" />
-        <result column="RECEIVE_NAME" property="receiveName" />
-        <result column="RECEIVE_TEL" property="receiveTel" />
-        <result column="RECEIVE_PROVINCE" property="receiveProvince" />
-        <result column="RECEIVE_CITY" property="receiveCity" />
-        <result column="RECEIVE_AREA" property="receiveArea" />
-        <result column="RECEIVE_ADDR" property="receiveAddr" />
-        <result column="LOGISTICS_NO" property="logisticsNo" />
-        <result column="LOGISTICS_BRAND" property="logisticsBrand" />
+        <result column="MEMO" property="memo" />
+        <result column="RECEIVER" property="receiver" />
+        <result column="TEL" property="tel" />
+        <result column="PROVINCE" property="province" />
+        <result column="CITY" property="city" />
+        <result column="AREA" property="area" />
+        <result column="ADDRESS" property="address" />
+        <result column="DELIVERY_ID" property="deliveryId" />
+        <result column="DELIVERY_FLOW_ID" property="deliveryFlowId" />
         <result column="CREATED_TIME" property="createdTime" />
         <result column="UPDATED_TIME" property="updatedTime" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ORDER_ID, CHANNEL_ID, ORDER_AMT, PAY_AMT, STATUS, RECEIVE_NAME, RECEIVE_TEL, RECEIVE_PROVINCE, RECEIVE_CITY, RECEIVE_AREA, RECEIVE_ADDR, LOGISTICS_NO, LOGISTICS_BRAND, CREATED_TIME, UPDATED_TIME
+        ORDER_ID, CHANNEL_ID, TITLE, ORDER_AMT, FREIGHT_AMT, PAY_AMT, STATUS, MEMO, RECEIVER, TEL, PROVINCE, CITY, AREA, ADDRESS, DELIVERY_ID, DELIVERY_FLOW_ID, CREATED_TIME, UPDATED_TIME
     </sql>
 
 </mapper>

mp-service/src/main/resources/mapper/manager/TicketBoxMapper.xml

@@ -7,24 +7,26 @@
         <id column="BOX_ID" property="boxId" />
         <result column="TITLE" property="title" />
         <result column="PIC_URL" property="picUrl" />
-        <result column="DESCRIPTION" property="description" />
         <result column="CATEGORY" property="category" />
+        <result column="DESCRIPTION" property="description" />
         <result column="TYPE" property="type" />
         <result column="QUANTITY" property="quantity" />
+        <result column="SALE_QTY" property="saleQty" />
         <result column="BOX_PRICE" property="boxPrice" />
         <result column="PKG_UNIT" property="pkgUnit" />
         <result column="PKG_QTY" property="pkgQty" />
-        <result column="SALES_QTY" property="salesQty" />
+        <result column="SALE_PKG_QTY" property="salePkgQty" />
         <result column="FACE_PRICE" property="facePrice" />
         <result column="SALE_PRICE" property="salePrice" />
         <result column="SALE_COMM_RATE" property="saleCommRate" />
+        <result column="STATUS" property="status" />
         <result column="CREATED_TIME" property="createdTime" />
         <result column="UPDATED_TIME" property="updatedTime" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        BOX_ID, TITLE, PIC_URL, DESCRIPTION, CATEGORY, TYPE, QUANTITY, BOX_PRICE, PKG_UNIT, PKG_QTY, SALES_QTY, FACE_PRICE, SALE_PRICE, SALE_COMM_RATE, CREATED_TIME, UPDATED_TIME
+        BOX_ID, TITLE, PIC_URL, CATEGORY, DESCRIPTION, TYPE, QUANTITY, SALE_QTY, BOX_PRICE, PKG_UNIT, PKG_QTY, SALE_PKG_QTY, FACE_PRICE, SALE_PRICE, SALE_COMM_RATE, STATUS, CREATED_TIME, UPDATED_TIME
     </sql>
 
-</mapper>
+</mapper>