添加短信代码

ace-common/src/main/java/com/github/wxiaoqi/security/common/log/XxLogInterceptor.java

@@ -68,6 +68,7 @@ public class XxLogInterceptor{
             }
         }catch (BaseException  e){
             commonLogService.initCommonLogLastPart(xxLogEntity, ObjectRestResponse.createFailedResult(e.getStatus(), e.getMessage()));
+            throw e;
         }catch (Exception e){
             commonLogService.initCommonLogLastPart(xxLogEntity, ObjectRestResponse.createFailedResult(500, e.getMessage()));
             throw e;

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/feign/UserFeign.java

@@ -39,6 +39,14 @@ public interface UserFeign {
     @RequestMapping(value = "/public/userinfo-by-uid")
     public ObjectRestResponse<UserDTO> userinfoByUid(@RequestParam("uid") Integer uid);
 
+    /**
+     * id获取用户信息
+     * @param id
+     * @return
+     */
+    @RequestMapping(value = "/public/app/userinfo-by-id")
+    public ObjectRestResponse<AppUserDTO> userDetailById(@RequestParam("id") Integer id);
+
 
     /**
      *status:0-判断是否认证过,1-认证成功后修改用户认证状态

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/PublicController.java

@@ -22,10 +22,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.lang.reflect.InvocationTargetException;
+import java.util.*;
 
 /**
  * ${DESCRIPTION}
@@ -70,14 +68,30 @@ public class PublicController {
     ObjectRestResponse userDetailByToken(String token) throws Exception {
         String username = userAuthUtil.getInfoFromToken(token).getId();
         if (username == null) {
-            throw new BaseException(ResultCode.NOTEXIST_CODE);
+            throw new BaseException(ResultCode.NOTEXIST_CODE
+                    , new HashSet<String>() {{add("用户名不存在！");}});
         }
-        AppUserDTO userDTO=new AppUserDTO();
         Integer userid = Integer.parseInt(username);
+        return ObjectRestResponse.succ(getAppUserInfoById(userid));
+    }
+
+    @RequestMapping(value = "/app/userinfo-by-id", method = RequestMethod.GET)
+    public @ResponseBody
+    ObjectRestResponse<AppUserDTO> userDetailById(Integer id) throws Exception {
+        if (id == null) {
+            throw new BaseException(ResultCode.NOTEXIST_CODE
+                    , new HashSet<String>() {{add("用户名不存在！");}});
+        }
+        return ObjectRestResponse.succ(getAppUserInfoById(id));
+    }
+
+    private AppUserDTO getAppUserInfoById(Integer userid) throws IllegalAccessException, InvocationTargetException {
+        AppUserDTO userDTO=new AppUserDTO();
         //获取用户基础信息
         AppUserVo userVo = detailBiz.getUserInfoById(userid);
         if (userVo == null) {
-            throw new BaseException(ResultCode.NOTEXIST_CODE);
+            throw new BaseException(ResultCode.NOTEXIST_CODE
+                    , new HashSet<String>() {{add("用户不存在！");}});
         }
         Integer id= userVo.getId();
         Integer positionId=userVo.getPositionId();
@@ -94,7 +108,7 @@ public class PublicController {
             userDTO.setPositionName(userPosition.getName());
         }
         userDTO.setId(id);
-        return new ObjectRestResponse<AppUserDetail>().rel(true).data(userDTO);
+        return userDTO;
     }
 
     @RequestMapping(value = "/userinfo-by-uid", method = RequestMethod.GET)

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/contant/enumerate/OrderTypeEnum.java

@@ -17,14 +17,14 @@ public enum OrderTypeEnum {
      */
     private String desc;
 
-    private static Map<Integer,String> codeAndDesc = new HashMap<Integer, String>();
+    public static Map<Integer, OrderTypeEnum> codeAndDesc = new HashMap<Integer, OrderTypeEnum>();
             //Maps.newHashMap();
 
-//    static{
-//        for(VehicleBookRecordStatus constantType : VehicleBookRecordStatus.values()){
-//            codeAndDesc.put(constantType.getCode(),constantType.getDesc());
-//        }
-//    }
+    static{
+        for(OrderTypeEnum enumE : OrderTypeEnum.values()){
+            codeAndDesc.put(enumE.getCode(), enumE);
+        }
+    }
 
     OrderTypeEnum(Integer code, String desc){
         this.code=code;

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/contant/enumerate/RefundTypeEnum.java

@@ -19,11 +19,11 @@ public enum RefundTypeEnum {
     private static Map<Integer,String> codeAndDesc = new HashMap<Integer, String>();
             //Maps.newHashMap();
 
-//    static{
-//        for(VehicleBookRecordStatus constantType : VehicleBookRecordStatus.values()){
-//            codeAndDesc.put(constantType.getCode(),constantType.getDesc());
-//        }
-//    }
+    static{
+        for(RefundTypeEnum enumE : RefundTypeEnum.values()){
+            codeAndDesc.put(enumE.getCode(),enumE.getDesc());
+        }
+    }
 
     RefundTypeEnum(Integer code, String desc){
         this.code=code;

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/BaseOrderBiz.java

 package com.xxfc.platform.order.biz;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import com.github.wxiaoqi.security.admin.dto.UserMemberDTO;
 import com.github.wxiaoqi.security.admin.entity.AppUserLogin;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
+import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
@@ -20,6 +22,7 @@ import com.xxfc.platform.order.pojo.order.OrderListVo;
 import com.xxfc.platform.order.pojo.order.OrderPageVO;
 import com.xxfc.platform.order.pojo.order.OrderVehicleCrosstownDto;
 import com.xxfc.platform.tour.feign.TourFeign;
+import com.xxfc.platform.universal.dto.SmsTemplateDTO;
 import com.xxfc.platform.universal.feign.ThirdFeign;
 import com.xxfc.platform.universal.vo.OrderRefundVo;
 import com.xxfc.platform.vehicle.common.RestResponse;
@@ -382,7 +385,10 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper,BaseOrder> {
      * @param orderNo
      * @param tradeNo
      */
+    @Transactional
     public void payNotifyHandle(String orderNo, String tradeNo, Integer type) {
+        OrderRentVehicleDetail orvd = new OrderRentVehicleDetail();
+        OrderMemberDetail omd = new OrderMemberDetail();
         BaseOrder baseOrder = this.selectOne(new BaseOrder() {{
             setNo(orderNo);
         }});
@@ -401,23 +407,25 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper,BaseOrder> {
             if(OrderTypeEnum.MEMBER.getCode().equals(baseOrder.getType())) {
                 //直接设置订单完成
                 updateOrder.setStatus(OrderStatusEnum.ORDER_FINISH.getCode());
-                OrderMemberDetail omd = orderMemberDetailBiz.selectOne(new OrderMemberDetail(){{
+                omd = orderMemberDetailBiz.selectOne(new OrderMemberDetail(){{
                     setOrderId(baseOrder.getId());
                 }});
 
                 //触发会员效益
-                ObjectRestResponse orr = userFeign.buyMember(new UserMemberDTO() {{
+                UserMemberDTO userMemberDTO = new UserMemberDTO() {{
                     setUserId(baseOrder.getUserId());
-                    setDiscount(omd.getRebate());
                     setIsBind(ISBIND_BIND);
-                    setMemberLevel(omd.getMemberLevel());
-                    setRentFreeDays(omd.getRentFreeNum());
-                    setTotalNumber(omd.getRentFreeNum());
-                }});
+                }};
+                userMemberDTO.setMemberLevel(omd.getMemberLevel());
+                userMemberDTO.setRentFreeDays(omd.getRentFreeNum());
+                userMemberDTO.setTotalNumber(omd.getRentFreeNum());
+                userMemberDTO.setDiscount(omd.getRebate());
+
+                ObjectRestResponse orr = userFeign.buyMember(userMemberDTO);
                 log.info("orr.getStatus() : " + orr.getStatus() );
             }else if(OrderTypeEnum.RentVehicle.getCode().equals(baseOrder.getType())) {
                 updateOrder.setStatus(OrderStatusEnum.ORDER_TOSTART.getCode());
-                OrderRentVehicleDetail orvd = orderRentVehicleBiz.selectOne(new OrderRentVehicleDetail(){{
+                orvd = orderRentVehicleBiz.selectOne(new OrderRentVehicleDetail(){{
                     setOrderId(baseOrder.getId());
                 }});
                 //车辆预定审核通过
@@ -436,7 +444,49 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper,BaseOrder> {
                 //站点总人数添加
                  tourFeign.updateTourGoodPersonNum(otd.getVerificationId(), TourFeign.TOTAL_PERSON, otd.getTotalNumber());
             }
-            this.updateSelectiveByIdRe(updateOrder);
+            try {
+                this.updateSelectiveByIdRe(updateOrder);
+            }finally {
+                OrderTypeEnum orderTypeEnum = OrderTypeEnum.codeAndDesc.get(baseOrder.getType());
+                AppUserDTO appUserDTO = userFeign.userDetailById(baseOrder.getUserId()).getData();
+                Integer smstype;
+                List<String> smsParams = new ArrayList<String>();
+                smsParams.add(baseOrder.getRealAmount().toString());
+                switch (orderTypeEnum) {
+                    case RentVehicle:
+                        if(orvd.getFreeDays() > 0) {
+                            smstype = SmsTemplateDTO.RENT_MEMENT;
+                            smsParams.add(orvd.getFreeDays().toString());
+                            smsParams.add(appUserDTO.getRentFreeDays().toString());
+                        }else {
+                            smstype = SmsTemplateDTO.RENT_NORMAL;
+                        }
+                        thirdFeign.sendTemplate(new SmsTemplateDTO(){{
+                            setPhoneNumbers(appUserDTO.getUsername());
+                            setType(smstype);
+                            setParams(smsParams.toArray(new String[smsParams.size()]));
+                        }});
+                        break;
+                    case TOUR:
+                        thirdFeign.sendTemplate(new SmsTemplateDTO(){{
+                            setPhoneNumbers(appUserDTO.getUsername());
+                            setType(SmsTemplateDTO.TOUR);
+                            setParams(smsParams.toArray(new String[smsParams.size()]));
+                        }});
+                        break;
+                    case MEMBER:
+                        smsParams.add(omd.getRentFreeNum().toString());
+                        smsParams.add(appUserDTO.getRentFreeDays().toString());
+                        thirdFeign.sendTemplate(new SmsTemplateDTO(){{
+                            setPhoneNumbers(appUserDTO.getUsername());
+                            setType(SmsTemplateDTO.MEMENT);
+                            setParams(smsParams.toArray(new String[smsParams.size()]));
+                        }});
+                        break;
+                    default:
+                        break;
+                }
+            }
         } else {
             log.error(" order has payed , orderNo:{}, tradeNo:{} ", orderNo, tradeNo);
         }

xx-universal/xx-universal-api/pom.xml

@@ -41,6 +41,7 @@
             <artifactId>httpclient</artifactId>
             <version>4.5</version>
         </dependency>
+        <!-- 短信机-->
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>

xx-universal/xx-universal-api/src/main/java/com/xxfc/platform/universal/dto/SmsTemplateDTO.java

@@ -12,6 +12,10 @@ import lombok.Data;
  */
 @Data
 public class SmsTemplateDTO {
+    public static final int RENT_NORMAL = 1;
+    public static final int RENT_MEMENT = 2;
+    public static final int TOUR = 3;
+    public static final int MEMENT = 4;
 
     //类型:1-租车订单通知(普通用户),2-租车订单短信(会员权益),3-旅游订单短信,4-加入会员通知
     private Integer type;

xx-universal/xx-universal-api/src/main/java/com/xxfc/platform/universal/feign/ThirdFeign.java

@@ -31,7 +31,7 @@ public interface ThirdFeign {
     //发送短信模板消息
     public JSONObject sendCode(@RequestParam("phone") String phone, @RequestParam("code")String code, @RequestParam("templateCode")String templateCode );
     //云通讯短信机
-    @RequestMapping(value = "/app/unauth/sendTemplate", method = RequestMethod.GET)
+    @RequestMapping(value = "/sms/app/unauth/sendTemplate", method = RequestMethod.POST)
     public ObjectRestResponse sendTemplate(SmsTemplateDTO smsTemplateDTO);
     @RequestMapping(value = "/file/app/unauth/uploadFiles", method = RequestMethod.POST)
     public JSONObject uploadFiles(@RequestParam(value = "files") MultipartFile[] files);

xx-universal/xx-universal-server/pom.xml

@@ -27,6 +27,12 @@
         <dependency>
             <groupId>com.aliyun</groupId>
             <artifactId>aliyun-java-sdk-core</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.google.code.gson</groupId>
+                    <artifactId>gson</artifactId>
+                </exclusion>
+            </exclusions>
             <version>4.4.2</version>
         </dependency>
         <dependency>

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/controller/SmsController.java

@@ -44,7 +44,7 @@ public class SmsController {
         return smsService.smsByCode(phone,code,templateCode);
     }
 
-    @RequestMapping(value = "/app/unauth/sendTemplate", method = RequestMethod.GET)
+    @RequestMapping(value = "/app/unauth/sendTemplate", method = RequestMethod.POST)
     public ObjectRestResponse sendTemplate(@RequestBody SmsTemplateDTO smsTemplateDTO) throws Exception {
         if(smsTemplateDTO==null){
              return  ObjectRestResponse.createDefaultFail();