Merge remote-tracking branch 'origin/master'

mall-service/src/main/java/com/txz/mall/controller/appcontroller/AppOrderController.java

@@ -2,10 +2,12 @@ package com.txz.mall.controller.appcontroller;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.txz.cif.dto.UserDTO;
 import com.txz.mall.business.OrderServiceBusiness;
 import com.txz.mall.core.AuthService;
 import com.txz.mall.core.Result;
 import com.txz.mall.core.ResultCode;
+import com.txz.mall.dubbo.client.CifUserDubboServiceClient;
 import com.txz.mall.model.StoreOrder;
 import com.txz.mall.service.StoreOrderService;
 import com.txz.mall.util.EasyToUseUtil;
@@ -41,6 +43,9 @@ public class AppOrderController {
     @Resource
     private OrderServiceBusiness orderServiceBusiness;
     
+    @Resource
+    private CifUserDubboServiceClient userDubboServiceClient;
+    
     @PostMapping("/add")
     @ApiOperation(value = "创建订单")
     public Result add(@Validated @RequestBody CreateOrderRequest orderRequest) {
@@ -50,6 +55,11 @@ public class AppOrderController {
             return Result.fail(ResultCode.OBJECT_IS_NULL);
         }
         Long tokenUserId = AuthService.getTokenUserId(null);
+        UserDTO user = userDubboServiceClient.getUser(tokenUserId);
+        if (user.getHasOrder() != 1) {
+            return Result.fail(ResultCode.USER_STATUS_IS_ERROR);
+        }
+        
         orderRequest.setUserId(tokenUserId);
         MyRecord record = storeOrderService.createOrder(orderRequest);
         return Result.success(record);
@@ -112,29 +122,29 @@ public class AppOrderController {
     }
     
     
-//    @GetMapping("/detail")
-//    @ApiOperation(value = "订单获取详情")
-//    public Result<StoreOrderVO> detail(@RequestParam Long id) {
-//        if (id == null) {
-//            return Result.fail(ResultCode.ID_IS_NULL);
-//        }
-//        StoreOrderVO vo = orderServiceBusiness.orderDetail(id,null);
-//        return Result.success(vo);
-//    }
-
+    //    @GetMapping("/detail")
+    //    @ApiOperation(value = "订单获取详情")
+    //    public Result<StoreOrderVO> detail(@RequestParam Long id) {
+    //        if (id == null) {
+    //            return Result.fail(ResultCode.ID_IS_NULL);
+    //        }
+    //        StoreOrderVO vo = orderServiceBusiness.orderDetail(id,null);
+    //        return Result.success(vo);
+    //    }
+    
     @GetMapping("/detail")
     @ApiOperation(value = "订单获取详情")
     public Result<StoreOrderVO> detail(@RequestParam(value = "id", required = false) Long id
-            ,@RequestParam(value = "orderNo", required = false) String orderNo) {
-
-        if (ObjectUtils.isEmpty(id) && ObjectUtils.isEmpty(orderNo) ) {
+            , @RequestParam(value = "orderNo", required = false) String orderNo) {
+        
+        if (ObjectUtils.isEmpty(id) && ObjectUtils.isEmpty(orderNo)) {
             return Result.fail(ResultCode.ID_IS_NULL);
         }
-        StoreOrderVO vo = orderServiceBusiness.orderDetail(id,orderNo);
+        StoreOrderVO vo = orderServiceBusiness.orderDetail(id, orderNo);
         return Result.success(vo);
     }
-
-
+    
+    
     @PostMapping("/list")
     @ApiOperation(value = "订单获取列表")
     public Result<List<StoreOrderVO>> list(@RequestBody StoreOrderDTO dto) {
@@ -261,13 +271,13 @@ public class AppOrderController {
     //        storeOrderService.importDelivery(file);
     //        return Result.success();
     //    }
-
-
-        @ApiOperation("待处理红点数")
-        @GetMapping("/pendingRedDots")
-        public Result pendingRedDots() {
-            return Result.success(storeOrderService.pendingRedDots());
-        }
-
-
+    
+    
+    @ApiOperation("待处理红点数")
+    @GetMapping("/pendingRedDots")
+    public Result pendingRedDots() {
+        return Result.success(storeOrderService.pendingRedDots());
+    }
+    
+    
 }

mall-service/src/main/java/com/txz/mall/core/ResultCode.java

@@ -1,7 +1,5 @@
 package com.txz.mall.core;
 
-import com.txz.mall.util.I18nUtil;
-
 /**
  * 响应码枚举，参考HTTP状态码的语义
  */
@@ -9,124 +7,125 @@ public enum ResultCode {
     /**
      * 系统错误
      */
-    SUCCESS("200","成功"),//成功
-    FAIL("400","失败"),//失败
-    UNAUTHORIZED("401","未认证（签名错误）"),//未认证（签名错误）
-    NOT_FOUND("404","接口不存在"),//接口不存在
-    INTERNAL_SERVER_ERROR("500","服务器内部错误"),
-    PERMISSION_NOT_HAS("409","没有操作权限"),
-    BACKSTAGE_IS_ERROR("501","网关异常"),
-
-
+    SUCCESS("200", "成功"),// 成功
+    FAIL("400", "失败"),// 失败
+    UNAUTHORIZED("401", "未认证（签名错误）"),// 未认证（签名错误）
+    NOT_FOUND("404", "接口不存在"),// 接口不存在
+    INTERNAL_SERVER_ERROR("500", "服务器内部错误"),
+    PERMISSION_NOT_HAS("409", "没有操作权限"),
+    BACKSTAGE_IS_ERROR("501", "网关异常"),
+    
+    
     APPCODE_IS_NULL("1005", "应用编号不能为空"),
-
+    
     /**
      * 业务错误
      */
-    OBJECT_IS_NULL("6000","对象不能为空"),
-    ID_IS_NULL("6001","对象ID不能为空"),
-    CODE_IS_NULL("6002","编号不能为空"),
-    NAME_IS_NULL("6003","名称不能为空"),
-    SEQ_IS_NULL("6004","排序不能为空"),
-    LEVEL_IS_NULL("6005","级别不能为空"),
+    OBJECT_IS_NULL("6000", "对象不能为空"),
+    ID_IS_NULL("6001", "对象ID不能为空"),
+    CODE_IS_NULL("6002", "编号不能为空"),
+    NAME_IS_NULL("6003", "名称不能为空"),
+    SEQ_IS_NULL("6004", "排序不能为空"),
+    LEVEL_IS_NULL("6005", "级别不能为空"),
     USERID_IS_NULL("6006", "user id cannot be empty"),
-    RESULT_IS_NULL("6007","查询结果为空"),
-    TYPE_IS_NULL("6008","类型为空"),
-    SQL_ERROR("6009","数据库异常"),
-    IDENTITY_IS_NULL("6010","身份证不能为空"),
-    CUSTOMERID_IS_NULL("6011","客户号不能为空"),
-    CUSTOMERID_IS_ERROR("6012","未查询到用户信息"),
-    SELECT_IS_ERROR("6013","数据异常查询失败，请联系检查用户信息"),
-    IDENTITYUPKEY_IS_ERROR("6014","身份证正面照片key不能为空"),
-    CODE_IS_INVALID("6015","验证码无效"),
-    TOKEN_IS_NULL("6016","TOKEN不能为空"),
+    RESULT_IS_NULL("6007", "查询结果为空"),
+    TYPE_IS_NULL("6008", "类型为空"),
+    SQL_ERROR("6009", "数据库异常"),
+    IDENTITY_IS_NULL("6010", "身份证不能为空"),
+    CUSTOMERID_IS_NULL("6011", "客户号不能为空"),
+    CUSTOMERID_IS_ERROR("6012", "未查询到用户信息"),
+    SELECT_IS_ERROR("6013", "数据异常查询失败，请联系检查用户信息"),
+    IDENTITYUPKEY_IS_ERROR("6014", "身份证正面照片key不能为空"),
+    CODE_IS_INVALID("6015", "验证码无效"),
+    TOKEN_IS_NULL("6016", "TOKEN不能为空"),
     INSUFFICIENT_BALANCE("8000", "余额不足"),
-
-
-
+    
+    
     /**
      * 缺少请求参数
      */
-    REQUEST_ARGS_IS_NULL("6000","缺少请求参数"),
-
-    PROVINCE_IS_NULL("6001", "未找到省信息" )
-    , CITY_IS_NULL("6002","未找到城市信息" ),
-
-    CITY_TYPE_IS_ERROR("6003", "城市类型错误" ),
+    REQUEST_ARGS_IS_NULL("6000", "缺少请求参数"),
+    USER_STATUS_IS_ERROR("1062", "用户状态异常，请联系管理员"),
+    
+    PROVINCE_IS_NULL("6001", "未找到省信息"), CITY_IS_NULL("6002", "未找到城市信息"),
+    
+    CITY_TYPE_IS_ERROR("6003", "城市类型错误"),
     CONTENT_IS_NULL("6004", "通知内容不能为空"),
-    STARTTIME_IS_NULL("6005","开始时间不能为空" ),
-    ENDTIME_IS_NULL("6006","结束时间不能为空" ),
-    TYPE_SEQ_IS_EXIST("6007","改类型排序已存在"),
-    LIFT_OBJECT_IS_NULL("6008","通知排序已经在顶部或者底部"),
-    AREACODE_IS_NULL("6009","地区码不能为空"),
-    GROUPID_IS_NULL("6010","分组id不能为空"),
-    LOTTERYID_IS_NULL("6011","抽奖id不能为空" ),
-    USER_IS_NULL("6012","用户未找到" ),
-    SCHOOL_IS_NULL("6013","学校未找到" ),
-    STATUS_IS_ERROR("6014","状态异常：未上架" ),
-    STATUS_HAS_ERROR("6026","状态异常：已上架" ),
-    CONVERSIONCODE_IS_UESD("6015","兑换码已使用完" ),
-    TIME_IS_ERROR("6016","无效的领奖时间" ),
-    NUM_IS_NULL("6017","数量不能为空或0" ),
-    NUM_IS_BIG("6018","数量太大"), BATCH_IS_ERROR("6019","批次已用完" ),
-    USER_NUM_ERROR("6020","用户兑换次数已满" ), CONVERSION_IS_NULL("6021","兑换码不存在，更多兑换码公众号活动获取" ),
-    AWARD_ERROR("6022","领奖失败" ),
-    CREATENAME_IS_NULL("6023","创建人为空" ), STATUS_IS_NULL("6024", "状态不能为空"),
-    VERSION_IS_NULL("6025", "版本号不能为空" ),
-    DISPOSE_STATUS_IS_ERROR("6027", "处理状态异常：未处理" ),
-    DISPOSE_STATUS_HAS_ERROR("6028", "处理状态异常：已处理" ),
-    STATION_IS_NULL("6029", "基站信息未找到" ),
-    AREA_IS_NULL("6030", "地区码未找到" ),
+    STARTTIME_IS_NULL("6005", "开始时间不能为空"),
+    ENDTIME_IS_NULL("6006", "结束时间不能为空"),
+    TYPE_SEQ_IS_EXIST("6007", "改类型排序已存在"),
+    LIFT_OBJECT_IS_NULL("6008", "通知排序已经在顶部或者底部"),
+    AREACODE_IS_NULL("6009", "地区码不能为空"),
+    GROUPID_IS_NULL("6010", "分组id不能为空"),
+    LOTTERYID_IS_NULL("6011", "抽奖id不能为空"),
+    USER_IS_NULL("6012", "用户未找到"),
+    SCHOOL_IS_NULL("6013", "学校未找到"),
+    STATUS_IS_ERROR("6014", "状态异常：未上架"),
+    STATUS_HAS_ERROR("6026", "状态异常：已上架"),
+    CONVERSIONCODE_IS_UESD("6015", "兑换码已使用完"),
+    TIME_IS_ERROR("6016", "无效的领奖时间"),
+    NUM_IS_NULL("6017", "数量不能为空或0"),
+    NUM_IS_BIG("6018", "数量太大"), BATCH_IS_ERROR("6019", "批次已用完"),
+    USER_NUM_ERROR("6020", "用户兑换次数已满"), CONVERSION_IS_NULL("6021", "兑换码不存在，更多兑换码公众号活动获取"),
+    AWARD_ERROR("6022", "领奖失败"),
+    CREATENAME_IS_NULL("6023", "创建人为空"), STATUS_IS_NULL("6024", "状态不能为空"),
+    VERSION_IS_NULL("6025", "版本号不能为空"),
+    DISPOSE_STATUS_IS_ERROR("6027", "处理状态异常：未处理"),
+    DISPOSE_STATUS_HAS_ERROR("6028", "处理状态异常：已处理"),
+    STATION_IS_NULL("6029", "基站信息未找到"),
+    AREA_IS_NULL("6030", "地区码未找到"),
     BAIDU_API_ERROR("6031", "获取百度接口异常"),
-    STARTTIME_IS_ERROR("6032", "活动未开始" ),
-    ENDTIME_IS_ERROR("6033", "活动已结束" ),
-    WEEK_CONVERSION_CODE_IS_NULL("6034", "周末兑换码未配置，请联系客服" ),
-
+    STARTTIME_IS_ERROR("6032", "活动未开始"),
+    ENDTIME_IS_ERROR("6033", "活动已结束"),
+    WEEK_CONVERSION_CODE_IS_NULL("6034", "周末兑换码未配置，请联系客服"),
+    
     APPCODE_IS_ERROR("6035", "应用编码异常"),
     PRIZE_IS_NULL("6036", "奖品为空，请联系管理员"),
-    PRIZE_IS_DRAW("6037", "奖品已领取" ),
-    USER_IS_NOT_VIP("6038", "您还不是会员，不能领取哦") ,
-    USER_IS_NOT_SVIP("6038", "您还不是永久会员，不能领取哦") ,
-    USER_IS_LOGIN_NUM_LESS("6039", "您登录次数不足，不能领取哦" ),
-    PERMIT_IS_UPDATED("6040", "通行证天数已更新") ,
-    PERMIT_SERVICE_IS_OFF("6041", "通行证服务未开启" ),
-    SIGNED_ERROR("6043", "已签到" ),
+    PRIZE_IS_DRAW("6037", "奖品已领取"),
+    USER_IS_NOT_VIP("6038", "您还不是会员，不能领取哦"),
+    USER_IS_NOT_SVIP("6038", "您还不是永久会员，不能领取哦"),
+    USER_IS_LOGIN_NUM_LESS("6039", "您登录次数不足，不能领取哦"),
+    PERMIT_IS_UPDATED("6040", "通行证天数已更新"),
+    PERMIT_SERVICE_IS_OFF("6041", "通行证服务未开启"),
+    SIGNED_ERROR("6043", "已签到"),
     ACTIVITY_IS_NOT_FINISH("6044", "未达到领取条件，请按活动规则领取。"),
-    ACTIVITY_IS_NOT_INTYPE("6045", "活动达标类型是空" ),
-    PRIZE_IS_ERROR("6046", "奖品配置异常" ),
+    ACTIVITY_IS_NOT_INTYPE("6045", "活动达标类型是空"),
+    PRIZE_IS_ERROR("6046", "奖品配置异常"),
     ACTIVITY_IS_END("6058", "活动已结束"),
-
+    
     ;
     /**
      * 状态码
      */
     private final String code;
     private final String message;
-
+    
     ResultCode(String code, String message) {
         this.code = code;
         this.message = message;
     }
-
+    
     public String code() {
         return code;
     }
-
+    
     public String message() {
         return message;
     }
-
+    
     public String getCode() {
         return code;
     }
-
+    
     public String getMessage() {
         return message;
     }
-
+    
     /**
      * 通过状态码获取ENUM的名字
+     *
      * @param code
+     *
      * @return
      */
     public static ResultCode getEnumByStatusCode(String code) {
@@ -135,7 +134,7 @@ public enum ResultCode {
                 return p;
             }
         }
-
+        
         return null;
     }
 }