优化停车劵功能

java110-bean/src/main/java/com/java110/dto/parkingCouponShop/ParkingCouponShopDto.java

@@ -15,6 +15,8 @@ import java.util.Date;
  **/
 public class ParkingCouponShopDto extends PageDto implements Serializable {
 
+
+
     private String quantity;
     private String paName;
     private String paId;

java110-bean/src/main/java/com/java110/dto/systemInfo/SystemInfoDto.java

@@ -27,6 +27,10 @@ public class SystemInfoDto extends PageDto implements Serializable {
     private String subSystemTitle;
     private String companyName;
     private String mallUrl;
+
+    private String ownerUrl;
+    private String propertyUrl;
+
     private String logoUrl;
     private String propertyTitle;
 
@@ -148,4 +152,20 @@ public class SystemInfoDto extends PageDto implements Serializable {
     public void setSystemSimpleTitle(String systemSimpleTitle) {
         this.systemSimpleTitle = systemSimpleTitle;
     }
+
+    public String getOwnerUrl() {
+        return ownerUrl;
+    }
+
+    public void setOwnerUrl(String ownerUrl) {
+        this.ownerUrl = ownerUrl;
+    }
+
+    public String getPropertyUrl() {
+        return propertyUrl;
+    }
+
+    public void setPropertyUrl(String propertyUrl) {
+        this.propertyUrl = propertyUrl;
+    }
 }

service-acct/src/main/java/com/java110/acct/cmd/parkingCoupon/SaveParkingCouponCarCmd.java

@@ -30,6 +30,7 @@ import com.java110.intf.acct.IParkingCouponShopV1InnerServiceSMO;
 import com.java110.intf.acct.IParkingCouponV1InnerServiceSMO;
 import com.java110.po.parkingCouponCar.ParkingCouponCarPo;
 import com.java110.po.parkingCouponShop.ParkingCouponShopPo;
+import com.java110.utils.cache.CommonCache;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.lock.DistributedLock;
 import com.java110.utils.util.Assert;
@@ -104,7 +105,13 @@ public class SaveParkingCouponCarCmd extends Cmd {
         Assert.hasKeyAndValue(reqJson, "shopId", "请求报文中未包含shopId");
         Assert.hasKeyAndValue(reqJson, "carNum", "请求报文中未包含carNum");
         Assert.hasKeyAndValue(reqJson, "giveWay", "请求报文中未包含giveWay");
+        Assert.hasKeyAndValue(reqJson, "code", "请求报文中未包含临时票据");
 
+        String codeKey = reqJson.getString("shopId") + reqJson.getString("code");
+
+        if (!reqJson.getString("code").equals(CommonCache.getAndRemoveValue(codeKey))) {
+            throw new CmdException("非法操作");
+        }
     }
 
     @Override
@@ -154,7 +161,7 @@ public class SaveParkingCouponCarCmd extends Cmd {
         parkingCouponCarPo.setCouponId(parkingCouponShopDtos.get(0).getCouponId());
         parkingCouponCarPo.setCommunityId(parkingCouponShopDtos.get(0).getCommunityId());
         parkingCouponCarPo.setStartTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
-        parkingCouponCarPo.setEndTime(DateUtil.getAddDayString(DateUtil.getCurrentDate(),DateUtil.DATE_FORMATE_STRING_A,1));
+        parkingCouponCarPo.setEndTime(DateUtil.getAddDayString(DateUtil.getCurrentDate(), DateUtil.DATE_FORMATE_STRING_A, 1));
         parkingCouponCarPo.setPaId(parkingCouponShopDtos.get(0).getPaId());
         parkingCouponCarPo.setState(ParkingCouponCarDto.STATE_WAIT);
         parkingCouponCarPo.setTypeCd(parkingCouponShopDtos.get(0).getTypeCd());

service-common/src/main/java/com/java110/common/cmd/system/ListSystemInfoCmd.java

@@ -20,18 +20,20 @@ import com.java110.core.annotation.Java110Cmd;
 import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
+import com.java110.dto.systemInfo.SystemInfoDto;
 import com.java110.intf.common.ISystemInfoV1InnerServiceSMO;
+import com.java110.utils.cache.MappingCache;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.BeanConvertUtil;
 import com.java110.vo.ResultVo;
-import org.springframework.beans.factory.annotation.Autowired;
-import com.java110.dto.systemInfo.SystemInfoDto;
-import java.util.List;
-import java.util.ArrayList;
-import org.springframework.http.ResponseEntity;
-import org.springframework.http.HttpStatus;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+
+import java.util.ArrayList;
+import java.util.List;
 
 
 /**
@@ -47,7 +49,7 @@ import org.slf4j.LoggerFactory;
 @Java110Cmd(serviceCode = "system.listSystemInfo")
 public class ListSystemInfoCmd extends Cmd {
 
-  private static Logger logger = LoggerFactory.getLogger(ListSystemInfoCmd.class);
+    private static Logger logger = LoggerFactory.getLogger(ListSystemInfoCmd.class);
     @Autowired
     private ISystemInfoV1InnerServiceSMO systemInfoV1InnerServiceSMOImpl;
 
@@ -59,22 +61,24 @@ public class ListSystemInfoCmd extends Cmd {
     @Override
     public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
 
-           SystemInfoDto systemInfoDto = BeanConvertUtil.covertBean(reqJson, SystemInfoDto.class);
+        SystemInfoDto systemInfoDto = BeanConvertUtil.covertBean(reqJson, SystemInfoDto.class);
 
-           int count = systemInfoV1InnerServiceSMOImpl.querySystemInfosCount(systemInfoDto);
+        int count = systemInfoV1InnerServiceSMOImpl.querySystemInfosCount(systemInfoDto);
 
-           List<SystemInfoDto> systemInfoDtos = null;
+        List<SystemInfoDto> systemInfoDtos = null;
 
-           if (count > 0) {
-               systemInfoDtos = systemInfoV1InnerServiceSMOImpl.querySystemInfos(systemInfoDto);
-           } else {
-               systemInfoDtos = new ArrayList<>();
-           }
+        if (count > 0) {
+            systemInfoDtos = systemInfoV1InnerServiceSMOImpl.querySystemInfos(systemInfoDto);
+            systemInfoDtos.get(0).setOwnerUrl(MappingCache.getValue("OWNER_WECHAT_URL"));
+            systemInfoDtos.get(0).setPropertyUrl(MappingCache.getValue("STAFF_WECHAT_URL"));
+        } else {
+            systemInfoDtos = new ArrayList<>();
+        }
 
-           ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, systemInfoDtos);
+        ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, systemInfoDtos);
 
-           ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
+        ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
 
-           cmdDataFlowContext.setResponseEntity(responseEntity);
+        cmdDataFlowContext.setResponseEntity(responseEntity);
     }
 }

service-store/src/main/java/com/java110/store/cmd/shop/ApplyShopCodeCmd.java

@@ -0,0 +1,57 @@
+package com.java110.store.cmd.shop;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.core.annotation.Java110Cmd;
+import com.java110.core.context.ICmdDataFlowContext;
+import com.java110.core.event.cmd.Cmd;
+import com.java110.core.event.cmd.CmdEvent;
+import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.dto.shop.ShopDto;
+import com.java110.dto.storeShop.StoreShopDto;
+import com.java110.intf.store.IStoreShopV1InnerServiceSMO;
+import com.java110.utils.cache.CommonCache;
+import com.java110.utils.exception.CmdException;
+import com.java110.utils.exception.GenerateCodeException;
+import com.java110.utils.util.Assert;
+import com.java110.vo.ResultVo;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.text.ParseException;
+import java.util.List;
+
+/**
+ * 申请商户的临时票据
+ */
+@Java110Cmd(serviceCode = "shop.applyShopCode")
+public class ApplyShopCodeCmd extends Cmd {
+
+    @Autowired
+    private IStoreShopV1InnerServiceSMO storeShopV1InnerServiceSMOImpl;
+
+    @Override
+    public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
+
+        Assert.hasKeyAndValue(reqJson, "shopId", "未包含商铺信息");
+
+        String storeId = context.getReqHeaders().get("store-id");
+
+        StoreShopDto storeShopDto = new StoreShopDto();
+        storeShopDto.setShopId(reqJson.getString("shopId"));
+        storeShopDto.setStoreId(storeId);
+        List<ShopDto> storeShopDtos = storeShopV1InnerServiceSMOImpl.queryStoreShops(storeShopDto);
+
+        Assert.listOnlyOne(storeShopDtos, "您没有权限操作");
+
+    }
+
+    @Override
+    public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
+
+        String code = GenerateCodeFactory.getUUID();
+
+        CommonCache.setValue(reqJson.getString("shopId")+code,code,CommonCache.PAY_DEFAULT_EXPIRE_TIME);
+
+        context.setResponseEntity(ResultVo.createResponseEntity(code));
+
+    }
+}