Merge branch 'release_real_202010' of https://git.malls.iformall.com/server/formallProject into release_real_202010

mallinkAdmin/src/main/java/com/iformall/controller/car/WxCarController.java

@@ -327,7 +327,7 @@ public class WxCarController extends BaseController {
         TenantEntity tenantEntity = getTenantInfo();
         /// 1, get mall's park
         WxPark park = getCurrentPark(tenantEntity);
-        if (park.getVendorType() == EnumCarVendor.CAR_ETCP.getCode()) {
+        if (null != park && park.getVendorType() == EnumCarVendor.CAR_ETCP.getCode()) {
             String params = park.getVendorParams();
             if(params == null) {
                 return new ResultData(ErrorCode.CAR_VENDOR_NOT_SUPPORT.getCode(), "车场不支持");

mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponPresentController.java

@@ -132,5 +132,14 @@ public class WxCouponPresentController extends BaseController {
         wxCouponPresentService.add(wxCouponPresent, list, phoneSet,EnumPayWay.PAY_WAY_WECHAT);
         return new ResultData();
     }
+    
+    @ApiOperation("新增接口")
+    @PostMapping("ttttttt")
+    @SystemControllerLog(description = "新增")
+    public ResultData tttttt(@RequestBody WxCouponPresent wxCouponPresent) {
+        //只需要给一端发就可以了。默认给微信小程序发
+        wxCouponPresentService.tttttttttttttt();
+        return new ResultData();
+    }
 
 }

mallinkAdmin/src/main/resources/application-prod.yml

@@ -58,8 +58,8 @@ spring:
   # EMAIL
   mail:
     host: smtp.exmail.qq.com
-    username: service@iformall.com
-    password: jGvApygXN7wc5SzN  # 授权密码
+    username: sysadministor@iformall.com   # 登陆密码sysAdmin1231
+    password: SWqPekCEmhUYuYCd  # 授权密码
     properties:
       mail:
         smtp:

mallinkBApi/src/main/resources/application-prod.yml

@@ -57,8 +57,8 @@ spring:
   # EMAIL
   mail:
     host: smtp.exmail.qq.com
-    username: service@iformall.com
-    password: jGvApygXN7wc5SzN  # 授权密码
+    username: sysadministor@iformall.com   # 登陆密码sysAdmin1231
+    password: SWqPekCEmhUYuYCd  # 授权密码
     properties:
       mail:
         smtp:

mallinkCApi/src/main/resources/application-prod.yml

@@ -57,8 +57,8 @@ spring:
   # EMAIL
   mail:
     host: smtp.exmail.qq.com
-    username: service@iformall.com
-    password: jGvApygXN7wc5SzN  # 授权密码
+    username: sysadministor@iformall.com   # 登陆密码sysAdmin1231
+    password: SWqPekCEmhUYuYCd  # 授权密码
     properties:
       mail:
         smtp:

mallinkCallback/src/main/java/com/iformall/controller/callback/car/WxParkCallBackBaseController.java

@@ -189,7 +189,7 @@ public class WxParkCallBackBaseController extends BaseController {
                 userCarQ.setTenantId(wxCarCmdLog.getTenantId());
             }
             userCarQ.setCarNumber(carNumber);
-            userCarQ.setVendorType(EnumCarVendor.CAR_ETCP.getCode());
+            userCarQ.setVendorType(vendor.getCode());
             // TODO 可能多用户关联同一张车牌
             List<WxCUserCar> userCarList = wxCUserCarService.getList(userCarQ);
             boolean bFirst = true;

mallinkCallback/src/main/java/com/iformall/controller/callback/car/jieshun/WxCarJieShunCallBackController.java

@@ -69,11 +69,11 @@ public class WxCarJieShunCallBackController extends WxParkCallBackBaseController
       * @Author furunxin
       * @Date 2020/7/8 上午8:27
       **/
-    @PostMapping(value = "/cyfParkInCallback")
+    @PostMapping(value = "/park/parkIn")
     public Result cyfParkInCallback(@RequestBody Map<String, Object> paramMap) {
-        log.info("["+getIpAddr()+"] cyfParkInCallback: " + paramMap.toString());
+        log.info("["+getIpAddr()+"] jieshunCarCallback: " + paramMap.toString());
         //解析车易付参数
-        return super.parkInCallBack(EnumCarVendor.CAE_CYF, EnumCarCmd.CAR_CYF_CALLBACK_PARK_IN, paramMap);
+        return super.parkInCallBack(EnumCarVendor.CAR_JIESHUN, EnumCarCmd.CAR_JIESHUN_CALLBACK_PARK_IN, paramMap);
     }
 
 
@@ -88,7 +88,7 @@ public class WxCarJieShunCallBackController extends WxParkCallBackBaseController
     public Result cyfParkOutCallback(@RequestBody WxCarCYFVo param) {
         String requestJson = JSONObject.toJSONString(param);
         log.info("["+getIpAddr()+"cyfParkOutCallback: " + requestJson);
-        return super.parkOutCallBack(EnumCarVendor.CAE_CYF, EnumCarCmd.CAR_CYF_CALLBACK_PARK_OUT, param);
+        return super.parkOutCallBack(EnumCarVendor.CAE_CYF, EnumCarCmd.CAR_JIESHUN_CALLBACK_PARK_OUT, param);
         
     }
     

mallinkCallback/src/main/resources/application-prod.yml

@@ -58,8 +58,8 @@ spring:
   # EMAIL
   mail:
     host: smtp.exmail.qq.com
-    username: service@iformall.com
-    password: jGvApygXN7wc5SzN  # 授权密码
+    username: sysadministor@iformall.com   # 登陆密码sysAdmin1231
+    password: SWqPekCEmhUYuYCd  # 授权密码
     properties:
       mail:
         smtp:

mallinkMQConsumer/src/main/resources/application-prod.yml

@@ -57,8 +57,8 @@ spring:
   # EMAIL
   mail:
     host: smtp.exmail.qq.com
-    username: service@iformall.com
-    password: jGvApygXN7wc5SzN  # 授权密码
+    username: sysadministor@iformall.com   # 登陆密码sysAdmin1231
+    password: SWqPekCEmhUYuYCd  # 授权密码
     properties:
       mail:
         smtp:

mallinkPosApi/src/main/resources/application-prod.yml

@@ -56,8 +56,8 @@ spring:
   # EMAIL
   mail:
     host: smtp.exmail.qq.com
-    username: service@iformall.com
-    password: jGvApygXN7wc5SzN  # 授权密码
+    username: sysadministor@iformall.com   # 登陆密码sysAdmin1231
+    password: SWqPekCEmhUYuYCd  # 授权密码
     properties:
       mail:
         smtp:

mallinkSchedule/src/main/resources/application-prod.yml

@@ -57,8 +57,8 @@ spring:
   # EMAIL
   mail:
     host: smtp.exmail.qq.com
-    username: service@iformall.com
-    password: jGvApygXN7wc5SzN  # 授权密码
+    username: sysadministor@iformall.com   # 登陆密码sysAdmin1231
+    password: SWqPekCEmhUYuYCd  # 授权密码
     properties:
       mail:
         smtp:

mallinkService/src/main/java/com/iformall/domain/po/msg/WxMsgRecord.java

@@ -58,8 +58,8 @@ public class WxMsgRecord extends BaseMsg {
     }
 
     public TenantEntity getTenantInfo() {
-        return new TenantEntity() {{
-            setTenantId(tenantId);
-        }};
+    	TenantEntity tenantEntity = new TenantEntity();
+    	tenantEntity.setTenantId(tenantId);
+    	return tenantEntity;
     }
 }

mallinkService/src/main/java/com/iformall/enums/EnumCarCmd.java

@@ -19,7 +19,11 @@ public enum EnumCarCmd {
     CAR_CYF_CALLBACK_PARK_IN(620,"车易付进场通知"),
     CAR_CYF_CALLBACK_PARK_OUT(621,"车易付进场通知"),
     CAR_CYF_CALLBACK_UNBIND(622,"车易付解绑车牌通知"),
-    CAR_CYF_CALLBACK_PAID(623,"车易付支付通知")
+    CAR_CYF_CALLBACK_PAID(623,"车易付支付通知"),
+    CAR_JIESHUN_CALLBACK_PARK_IN(624,"捷顺进场通知"),
+    CAR_JIESHUN_CALLBACK_PARK_OUT(625,"捷顺进场通知"),
+    CAR_JIESHUN_CALLBACK_UNBIND(626,"捷顺解绑车牌通知"),
+    CAR_JIESHUN_CALLBACK_PAID(627,"捷顺支付通知")
     ;
 
     public static EnumCarCmd getEnum(Integer code) {

mallinkService/src/main/java/com/iformall/service/WxCouponPresentService.java

@@ -20,5 +20,8 @@ public interface WxCouponPresentService {
     WxCouponPresent findById(Long id);
 
     ResultData add(WxCouponPresent wxCouponPresent, List<WxCouponPassword> list, Set<String> phoneSet,EnumPayWay payWay);
+    
+    
+    void tttttttttttttt();
 
 }

mallinkService/src/main/java/com/iformall/service/impl/WxCouponPresentServiceImpl.java

@@ -15,6 +15,8 @@ import com.iformall.mapper.WxCouponPresentMapper;
 import com.iformall.mq.MqBaseProducer;
 import com.iformall.service.WxAppinfoService;
 import com.iformall.service.WxCouponPresentService;
+import com.iformall.service.msg.impl.SendSmsServiceImpl;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -103,4 +105,32 @@ public class WxCouponPresentServiceImpl implements WxCouponPresentService {
         logger.info("系统发卡发送短信结束");
         logger.info("》》》》》》》》》》》");
     }
+
+    
+    @Autowired
+    private SendSmsServiceImpl sendSmsService;
+	@Override
+	public void tttttttttttttt() {
+		WxCouponPassword couponPassword = wxCouponPasswordMapper.selectById(483888264577998850L);
+		TenantEntity tenantEntity = new TenantEntity();
+		tenantEntity.setTenantId("789");
+		
+		Map<String, String> msgReplaceMap = new HashMap();
+        msgReplaceMap.put("id", couponPassword.getId().toString());
+        msgReplaceMap.put("app", "富茂链客");
+        msgReplaceMap.put("title", "饼干消费卡");
+        msgReplaceMap.put("pw", couponPassword.getPassword());
+        WxMsgRecord wxMsgRecord = new WxMsgRecord();
+        wxMsgRecord.setMsgType(EnumMsgRecordType.SMS.getCode());
+        wxMsgRecord.setModelType(EnumMsgModel.COUPON_CARD_SEND.getCode());
+        wxMsgRecord.setReceiver("18600671341");
+        wxMsgRecord.updateTenantInfo(tenantEntity);
+        wxMsgRecord.setDynamicContentMap(msgReplaceMap);
+        try {
+			sendSmsService.send(wxMsgRecord);
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+	}
 }

mallinkService/src/main/java/com/iformall/service/park/impl/jieshun/JieShunParkCallbackService.java

@@ -19,10 +19,33 @@ import lombok.extern.slf4j.Slf4j;
 @Service
 public class JieShunParkCallbackService extends BaseParkService implements ParkCallBackAdapterService {
 
+	/**
+	 * {
+		“pno”:”平台编号”,
+		“tn”:”令牌”,
+		“ts”:”请求时间”
+		“sn”:”签名”,
+		“ve”:”版本号”,
+		“dataItems”:“[{
+			\ “itemId\”: \”435FA12F3C4747B0BA48E945868FC420\”,
+			\ “parkName” : \”测试\”,
+			\ “parkCode\” : \” test\”,
+			\ “inTime\” : \”2017-08-28 15:40:41\”,
+			\ “inOperator\”： \”张山\”
+			\ “carNumber” : \”粤-A12345\”,
+			\ “idno” : \”1234455\”,
+			\ “equipCode\”: \”2312313\”,
+			\ “equipName” : \”入口\”,
+			…
+			},
+			……
+		]”
+	}
+	 */
 	@Override
 	public ParkNotifyParam parseInNoticyParam(Object param) {
 		Map<String, Object> paramMap = (Map<String, Object>) param;
-		String carNumber = paramMap.get(CYFUtil.CYF_CAR_NUMBER).toString();
+		String carNumber = paramMap.get(JieShunUtil.CYF_CAR_NUMBER).toString();
         String cyfParkId = paramMap.get(CYFUtil.CYF_PARK_ID).toString();
         String parkName = paramMap.get(CYFUtil.CYF_PARK_NAME).toString();
         String synId = paramMap.get(CYFUtil.CYF_SYN_ID).toString();

mallinkSysAdmin/src/main/resources/application-prod.yml

@@ -57,8 +57,8 @@ spring:
   # EMAIL
   mail:
     host: smtp.exmail.qq.com
-    username: service@iformall.com
-    password: jGvApygXN7wc5SzN  # 授权密码
+    username: sysadministor@iformall.com   # 登陆密码sysAdmin1231
+    password: SWqPekCEmhUYuYCd  # 授权密码
     properties:
       mail:
         smtp:

mallinkWebSocketServer/src/main/resources/application-prod.yml

@@ -57,8 +57,8 @@ spring:
   # EMAIL
   mail:
     host: smtp.exmail.qq.com
-    username: service@iformall.com
-    password: jGvApygXN7wc5SzN  # 授权密码
+    username: sysadministor@iformall.com   # 登陆密码sysAdmin1231
+    password: SWqPekCEmhUYuYCd  # 授权密码
     properties:
       mail:
         smtp: