Merge branch 'feature/2.0.6-农工商商品兑换券' into develop

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/SellCouponOrderServiceImpl.java

order-application-service/src/main/java/cn/freemud/entities/vo/NgsSellCouponCreateOrderVo.java

@@ -31,4 +31,7 @@ public class NgsSellCouponCreateOrderVo {
 //    @NotEmpty(message = "version 版本号不能为空")
     private String version;
 
+    @NotEmpty(message = "appId")
+    private String appId;
+
 }

order-application-service/src/main/java/cn/freemud/service/impl/SellCouponOrderServiceImpl.java

@@ -282,7 +282,7 @@ public class SellCouponOrderServiceImpl {
         orderExtInfoDto.setFromAppId(userLoginInfoDto.getWxAppId());
 
         String date = DateUtil.convert2String(new Date(), "yyyyMMdd");
-        String key = this.getFolwNo(partnerId, date);
+        String key = this.getFolwNo(requestVo.getAppId(), date);
 
         int flowno = 0;
         RedisTemplate redisTemplate = redisCache.getRedisTemplate();
@@ -291,8 +291,7 @@ public class SellCouponOrderServiceImpl {
         } else {
             flowno = redisTemplate.opsForValue().increment(key, 1).intValue();
         }
-
-        String stationid = getStationId(date, partnerId, flowno);
+        String stationid = getStationId(date, requestVo.getAppId(), flowno);
 
         orderExtInfoDto.setStationId(stationid);
 
@@ -301,16 +300,16 @@ public class SellCouponOrderServiceImpl {
 
     }
 
-    private String getStationId(String date, String partnerId, int flowno) {
+    private String getStationId(String date, String appid, int flowno) {
         String stationid = "";
         int length = String.valueOf(flowno).length();
-        if (easyPartnerId.equals(partnerId)){
+        if (easyPartnerId.equals(appid)){
             stationid = date + "6600000001";
             for (int i = 0; i < 5 - length; i++){
                 stationid += "0";
             }
             stationid += flowno;
-        } else if (supermarketPartnerId.equals(partnerId)) {
+        } else if (supermarketPartnerId.equals(appid)) {
             stationid = date + "9988800001";
             for (int i = 0; i < 5 - length; i++){
                 stationid += "0";