Merge remote-tracking branch 'origin/dev' into jrz_dev

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

@@ -307,7 +307,10 @@ public class OrderMsgBiz {
 
                         //发送用户取消消息
                         sms2AppUser(startCompanyDetail, endCompanyDetail, orvd, otd, omd, baseOrder, appUserDTO, smstype, smsParams);
-                        //sms2RefundAppUser(BigDecimal.ZERO, orderRefund.getDeductAmount(), depositOrderRefund.getRefundAmount().add(orderRefund.getRefundAmount()), BigDecimal.ZERO, baseOrder, appUserDTO, smstype, smsParams);
+
+                        //发送用户退款消息
+//                        smsParams.clear();
+//                        sms2RefundAppUser(BigDecimal.ZERO, orderRefund.getDeductAmount(), depositOrderRefund.getRefundAmount().add(orderRefund.getRefundAmount()), BigDecimal.ZERO, baseOrder, appUserDTO, smstype, smsParams);
 
                         //后台发送消息(出车人)
                         smsParams.clear();
@@ -479,6 +482,7 @@ public class OrderMsgBiz {
                 smsParams.add(startCompanyDetail.detailAddr());
                 break;
             case SmsTemplateDTO.PAY_B :
+                smsParams.add(appUserDTO.getRealname());
                 smsParams.add(orvd.getFreeDays().toString());
                 smsParams.add(appUserDTO.getRentFreeDays().toString());
                 smsParams.add(baseOrder.getRealAmount().toString());

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/biz/AliYunSmsBiz.java

@@ -125,7 +125,7 @@ public class AliYunSmsBiz {
                  SmsService.sendTemplateToJson(phoneNumbers,params,TEMPLATE_ID_PAY_D);
                  break;
              case 14 :
-                 SmsService.sendTemplateToJson(phoneNumbers,params,TEMPLATE_ID_PAY_E);
+                 SmsService.sendTemplateToJson14(phoneNumbers,params,TEMPLATE_ID_PAY_E);
                  break;
              case 15 :
                  SmsService.sendTemplateToJson(phoneNumbers,params,TEMPLATE_ID_PAY_F);

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/service/SmsService.java

@@ -178,7 +178,7 @@ public class SmsService {
         //request.setOutId("yourOutId");
         //hint 此处可能会抛出异常，注意catch
         SendSmsResponse  sendSmsResponse = acsClient.getAcsResponse(request);
-        log.info("短信接口返回的数据----------------mobile======"+PhoneNumbers+"----templateParam===="+params);
+        log.info("短信接口返回的数据--templateCode===="+templateCode+"--------mobile======"+PhoneNumbers+"----templateParam===="+params);
         log.info("Code=" + sendSmsResponse.getCode());
         log.info("Message=" + sendSmsResponse.getMessage());
         log.info("RequestId=" + sendSmsResponse.getRequestId());
@@ -211,6 +211,31 @@ public class SmsService {
 
     }
 
+    public  static  void  sendTemplateToJson14(String PhoneNumbers,String[] params,String templateCode){
+        try {
+            JSONObject jsonParams=new JSONObject();
+            for (int i=0;i<params.length;i++){
+                String para=params[i];
+                if (para.contains("【")){
+                    para=para.replaceAll("【","");
+                }
+                if (para.contains("】")){
+                    para=para.replaceAll("】","");
+                }
+                if (i>3){
+                    jsonParams.put(param+(i+2),para);
+                }else {
+                    jsonParams.put(param+(i+1),para);
+                }
+
+            }
+            sendTemplate(PhoneNumbers,jsonParams.toJSONString(),templateCode);
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+
+    }
+
     public static void main(String[] args) throws ClientException, InterruptedException {
         SmsService smsService=new SmsService();
         //发短信

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/CompanyBaseBiz.java

@@ -116,6 +116,34 @@ public class CompanyBaseBiz extends BaseBiz<CompanyBaseMapper, CompanyBase>  {
 
         return  ObjectRestResponse.succ();
     }
+
+    //临时数据同步3
+    public ObjectRestResponse synchro3(){
+        List<BranchCompanyStockInfo> list= stockInfoMapper.selectAll();
+        if (list.size()>0){
+            int num=0;
+            for (BranchCompanyStockInfo companyStockInfo:list){
+                Integer  id=companyStockInfo.getId();
+                Integer balance=companyStockInfo.getBalance();
+                Integer total=companyStockInfo.getTotal();
+                BigDecimal price=companyStockInfo.getPrice();
+                Integer state=companyStockInfo.getState();
+                BranchCompanyStockRight branchCompanyStockRight=stockRightBiz.selectById(id);
+                if (branchCompanyStockRight!=null){
+                    branchCompanyStockRight=new BranchCompanyStockRight();
+                    branchCompanyStockRight.setId(id);
+                    branchCompanyStockRight.setBalance(balance);
+                    branchCompanyStockRight.setStockState(state);
+                    branchCompanyStockRight.setTotal(total);
+                    branchCompanyStockRight.setPrice(price);
+                    stockRightBiz.updateSelectiveById(branchCompanyStockRight);
+                    num++;
+                }
+                log.info("----成功---num=="+num+"---id==="+id);
+            }
+        }
+        return  ObjectRestResponse.succ();
+    }
     //设置基础信息
     public  ObjectRestResponse updCompany(CompanyVo companyVo){
         if (companyVo==null|| StringUtils.isBlank(companyVo.getCompanyName())|| StringUtils.isBlank(companyVo.getName())||

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/admin/CompanyController.java

@@ -31,6 +31,12 @@ public class CompanyController extends BaseController<CompanyBaseBiz> {
         return baseBiz.synchro2();
     }
 
+    @ApiOperation("同步股权3")
+    @PostMapping("synchro3")
+    public ObjectRestResponse<String> synchro3() {
+        return baseBiz.synchro3();
+    }
+
 
     @ApiOperation("查询公司列表")
     @RequestMapping(value = "/list", method = RequestMethod.GET)

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/CompanyBaseMapper.xml

@@ -53,6 +53,6 @@
                 and (b.`name` like CONCAT('%',#{name},'%') or c.`name` like CONCAT('%',#{name},'%') )
             </if>
         </where>
-       order by b.id desc
+       order by b.upd_time desc
   </select>
 </mapper>
\ No newline at end of file