|
@@ -72,9 +72,16 @@ public class PayOrderController {
|
|
|
resultMap.put("stationName", stationInfos.getStationName());
|
|
|
AppUserInfo appUserInfos = appUserInfoService.getAppUserInfo(appUserInfo);
|
|
|
if(appUserInfos !=null){
|
|
|
- payOrderRequest.setCustomerPhone(appUserInfos.getMobilePhone()); //客户手机号; 注:此处存放手机号用于获取客户信息参数查询
|
|
|
- payOrderRequest.setUnionId(appUserInfos.getUnionId()); //客户UnionId;注:此处存放unionId用于获取客户电子卡参数查询
|
|
|
- payOrderRequest.setCustomerName(appUserInfos.getBlogNickName()); //昵称
|
|
|
+ //payOrderRequest存放参数原因:用于其他方法形参
|
|
|
+ payOrderRequest.setCardEnabledFlagGroup(stationInfos.getCardEnabledFlagGroup()); //集团是否开启电子卡
|
|
|
+ payOrderRequest.setCardRuleFlagGroup(stationInfos.getCardRuleFlagGroup()); //集团是否共享
|
|
|
+ payOrderRequest.setIntegralFlagGroup(stationInfos.getIntegralFlagGroup()); //集团是否启用积分功能
|
|
|
+ payOrderRequest.setIntegralRuleFlagGroup(stationInfos.getIntegralRuleFlagGroup()); //集团是否共享
|
|
|
+ payOrderRequest.setCustomerPhone(appUserInfos.getMobilePhone()); //客户手机号; 注:此处存放手机号用于获取客户信息参数查询
|
|
|
+ payOrderRequest.setUnionId(appUserInfos.getUnionId()); //客户UnionId;注:此处存放unionId用于获取客户电子卡参数查询
|
|
|
+ payOrderRequest.setCustomerName(appUserInfos.getBlogNickName()); //昵称
|
|
|
+ payOrderRequest.setGroupId(stationInfos.getGroupId()); //集团ID
|
|
|
+
|
|
|
payOrder.setConsumer(appUserInfos.getBlogNickName()); //昵称
|
|
|
payOrder.setConsumerId(appUserInfos.getUserId()); //用户id
|
|
|
Random random = new Random();
|
|
@@ -195,8 +202,8 @@ public class PayOrderController {
|
|
|
String oilPrice = result.get("oilPrice").toString(); //油站油品价格
|
|
|
String discountSetting = result.get("discountSetting").toString(); //优惠方案
|
|
|
String cardEnabledFlag = result.get("cardEnabledFlag").toString(); //是否开启电子卡
|
|
|
- String cardRuleFlag = result.get("cardRuleFlag").toString(); //是否共享电子卡储值规则
|
|
|
- String groupId = result.get("groupId").toString(); //是否共享电子卡储值规则
|
|
|
+ String cardRuleFlag = result.get("cardRuleFlag").toString(); //是否共享电子卡储值规则
|
|
|
+ String groupId = payOrderRequest.getGroupId().toString(); //集团ID
|
|
|
|
|
|
Map<String ,Object> params = new HashMap<String, Object>();
|
|
|
params.put("stationId", stationId);
|
|
@@ -212,6 +219,14 @@ public class PayOrderController {
|
|
|
params.put("cardOilsType", payOrderRequest.getCardOilsType());
|
|
|
params.put("customerName", customerName);
|
|
|
params.put("userPhone", userPhone);
|
|
|
+// integralRuleFlagGroup; //集团积分规则是否共享
|
|
|
+// integralFlagGroup; //集团是否开启积分功能
|
|
|
+// cardRuleFlagGroup; //集团是否共享电子卡充值规则
|
|
|
+// cardEnabledFlagGroup; //集团是否开启电子卡
|
|
|
+ params.put("integralRuleFlagGroup", payOrderRequest.getIntegralRuleFlagGroup());
|
|
|
+ params.put("integralFlagGroup", payOrderRequest.getIntegralFlagGroup());
|
|
|
+ params.put("cardRuleFlagGroup", payOrderRequest.getCardRuleFlagGroup());
|
|
|
+ params.put("cardEnabledFlagGroup", payOrderRequest.getCardEnabledFlagGroup());
|
|
|
|
|
|
switch (discountSetting){
|
|
|
case "0": //不执营销方案时 计算等级优惠
|
|
@@ -293,12 +308,26 @@ public class PayOrderController {
|
|
|
payOrderResultInfo.setOilPrice(oilPrice.toString());
|
|
|
payOrderResultInfo.setDzkAmt(amt.toString());
|
|
|
payOrderResultInfo.setOilsCardFlag("0");
|
|
|
- payOrderResultInfo.setCardEnabledFlag(params.get("cardEnabledFlag").toString());
|
|
|
+ if(params.get("cardRuleFlagGroup").toString().equals("1")){
|
|
|
+ //表示开启共享
|
|
|
+ if(params.get("cardEnabledFlagGroup").toString().equals("1")){ //表示开启电子卡功能
|
|
|
+ payOrderResultInfo.setCardEnabledFlag("1");
|
|
|
+ }else {
|
|
|
+ payOrderResultInfo.setCardEnabledFlag("0");
|
|
|
+ }
|
|
|
+ }else {
|
|
|
+ //不共享,则查看油站电子卡是否开启
|
|
|
+ if(params.get("cardEnabledFlag").toString().equals("1")){
|
|
|
+ payOrderResultInfo.setCardEnabledFlag("1");
|
|
|
+ }else {
|
|
|
+ payOrderResultInfo.setCardEnabledFlag("0");
|
|
|
+ }
|
|
|
+ }
|
|
|
logger.info("油站是否开启电子会员卡功能: " +params.get("cardEnabledFlag").toString());
|
|
|
- if(params.get("cardEnabledFlag").toString().equals("1")){
|
|
|
+ if(payOrderResultInfo.getCardEnabledFlag().equals("1")){
|
|
|
CustomerCardSetting customerCardSetting = new CustomerCardSetting();
|
|
|
customerCardSetting.setStationId(Integer.valueOf(params.get("stationId").toString()));
|
|
|
- if(params.get("cardRuleFlag").toString().equals("1")){
|
|
|
+ if(params.get("cardRuleFlagGroup").toString().equals("1")){
|
|
|
customerCardSetting.setStationId(Integer.valueOf(params.get("groupId").toString()));
|
|
|
}
|
|
|
List<CustomerCardSetting> cardRechargeSettingList = electronicMembershipCardService.getCardRechargeSettingList(customerCardSetting);
|
|
@@ -341,7 +370,7 @@ public class PayOrderController {
|
|
|
customerElectronicCard.setMobilePhone(params.get("userPhone").toString());
|
|
|
customerElectronicCard.setCustomerName(params.get("customerName").toString());
|
|
|
//查询客户余额和卡的类型
|
|
|
- Map<String, String> map = this.selectCardBalance(customerElectronicCard);
|
|
|
+ Map<String, String> map = this.selectCardBalance(customerElectronicCard, params);
|
|
|
payOrderResultInfo.setBalance(map.get("balance"));
|
|
|
payOrderResultInfo.setOilsCardFlag(map.get("oilsCardFlag"));
|
|
|
payOrderResultInfo.setCardOilsType(map.get("cardOilsType"));
|
|
@@ -399,12 +428,26 @@ public class PayOrderController {
|
|
|
payOrderResultInfo.setOilPrice(oilPrice.toString());
|
|
|
payOrderResultInfo.setDzkAmt(amt.toString());
|
|
|
payOrderResultInfo.setOilsCardFlag("0");
|
|
|
- payOrderResultInfo.setCardEnabledFlag(params.get("cardEnabledFlag").toString());
|
|
|
+ if(params.get("cardRuleFlagGroup").toString().equals("1")){
|
|
|
+ //表示开启共享
|
|
|
+ if(params.get("cardEnabledFlagGroup").toString().equals("1")){ //表示开启电子卡功能
|
|
|
+ payOrderResultInfo.setCardEnabledFlag("1");
|
|
|
+ }else {
|
|
|
+ payOrderResultInfo.setCardEnabledFlag("0");
|
|
|
+ }
|
|
|
+ }else {
|
|
|
+ //不共享,则查看油站电子卡是否开启
|
|
|
+ if(params.get("cardEnabledFlag").toString().equals("1")){
|
|
|
+ payOrderResultInfo.setCardEnabledFlag("1");
|
|
|
+ }else {
|
|
|
+ payOrderResultInfo.setCardEnabledFlag("0");
|
|
|
+ }
|
|
|
+ }
|
|
|
logger.info("油站是否开启电子会员卡功能: " +params.get("cardEnabledFlag").toString());
|
|
|
- if(params.get("cardEnabledFlag").toString().equals("1")){
|
|
|
+ if(payOrderResultInfo.getCardEnabledFlag().equals("1")){
|
|
|
CustomerCardSetting customerCardSetting = new CustomerCardSetting();
|
|
|
customerCardSetting.setStationId(Integer.valueOf(params.get("stationId").toString()));
|
|
|
- if(params.get("cardRuleFlag").toString().equals("1")){
|
|
|
+ if(params.get("cardRuleFlagGroup").toString().equals("1")){
|
|
|
customerCardSetting.setStationId(Integer.valueOf(params.get("groupId").toString()));
|
|
|
}
|
|
|
List<CustomerCardSetting> cardRechargeSettingList = electronicMembershipCardService.getCardRechargeSettingList(customerCardSetting);
|
|
@@ -445,7 +488,7 @@ public class PayOrderController {
|
|
|
customerElectronicCard.setMobilePhone(params.get("userPhone").toString());
|
|
|
customerElectronicCard.setCustomerName(params.get("customerName").toString());
|
|
|
//查询客户余额和卡的类型
|
|
|
- Map<String, String> map = this.selectCardBalance(customerElectronicCard);
|
|
|
+ Map<String, String> map = this.selectCardBalance(customerElectronicCard, params);
|
|
|
payOrderResultInfo.setBalance(map.get("balance"));
|
|
|
payOrderResultInfo.setOilsCardFlag(map.get("oilsCardFlag"));
|
|
|
payOrderResultInfo.setCardOilsType(map.get("cardOilsType"));
|
|
@@ -505,12 +548,26 @@ public class PayOrderController {
|
|
|
payOrderResultInfo.setOilPrice(oilPrice.toString());
|
|
|
payOrderResultInfo.setDzkAmt(amt.toString());
|
|
|
payOrderResultInfo.setOilsCardFlag("0");
|
|
|
- payOrderResultInfo.setCardEnabledFlag(params.get("cardEnabledFlag").toString());
|
|
|
+ if(params.get("cardRuleFlagGroup").toString().equals("1")){
|
|
|
+ //表示开启共享
|
|
|
+ if(params.get("cardEnabledFlagGroup").toString().equals("1")){ //表示开启电子卡功能
|
|
|
+ payOrderResultInfo.setCardEnabledFlag("1");
|
|
|
+ }else {
|
|
|
+ payOrderResultInfo.setCardEnabledFlag("0");
|
|
|
+ }
|
|
|
+ }else {
|
|
|
+ //不共享,则查看油站电子卡是否开启
|
|
|
+ if(params.get("cardEnabledFlag").toString().equals("1")){
|
|
|
+ payOrderResultInfo.setCardEnabledFlag("1");
|
|
|
+ }else {
|
|
|
+ payOrderResultInfo.setCardEnabledFlag("0");
|
|
|
+ }
|
|
|
+ }
|
|
|
logger.info("油站是否开启电子会员卡功能: " +params.get("cardEnabledFlag").toString());
|
|
|
- if(params.get("cardEnabledFlag").toString().equals("1")){
|
|
|
+ if(payOrderResultInfo.getCardEnabledFlag().equals("1")){
|
|
|
CustomerCardSetting customerCardSetting = new CustomerCardSetting();
|
|
|
customerCardSetting.setStationId(Integer.valueOf(params.get("stationId").toString()));
|
|
|
- if(params.get("cardRuleFlag").toString().equals("1")){
|
|
|
+ if(params.get("cardRuleFlagGroup").toString().equals("1")){
|
|
|
customerCardSetting.setStationId(Integer.valueOf(params.get("groupId").toString()));
|
|
|
}
|
|
|
List<CustomerCardSetting> cardRechargeSettingList = electronicMembershipCardService.getCardRechargeSettingList(customerCardSetting);
|
|
@@ -552,7 +609,7 @@ public class PayOrderController {
|
|
|
customerElectronicCard.setMobilePhone(params.get("userPhone").toString());
|
|
|
customerElectronicCard.setCustomerName(params.get("customerName").toString());
|
|
|
//查询客户余额和卡的类型
|
|
|
- Map<String, String> map = this.selectCardBalance(customerElectronicCard);
|
|
|
+ Map<String, String> map = this.selectCardBalance(customerElectronicCard, params);
|
|
|
payOrderResultInfo.setBalance(map.get("balance"));
|
|
|
payOrderResultInfo.setOilsCardFlag(map.get("oilsCardFlag"));
|
|
|
payOrderResultInfo.setCardOilsType(map.get("cardOilsType"));
|
|
@@ -616,15 +673,29 @@ public class PayOrderController {
|
|
|
payOrderResultInfo.setOilPrice(oilPrice.toString());
|
|
|
payOrderResultInfo.setDzkAmt(amt.toString());
|
|
|
payOrderResultInfo.setOilsCardFlag("0");
|
|
|
- payOrderResultInfo.setCardEnabledFlag(params.get("cardEnabledFlag").toString());
|
|
|
- //电子卡是否开启
|
|
|
- logger.info("油站是否开启电子会员卡功能: " +params.get("cardEnabledFlag").toString());
|
|
|
- if(params.get("cardEnabledFlag").toString().equals("1")){
|
|
|
+ if(params.get("cardRuleFlagGroup").toString().equals("1")){
|
|
|
+ //表示开启共享
|
|
|
+ if(params.get("cardEnabledFlagGroup").toString().equals("1")){ //表示开启电子卡功能
|
|
|
+ payOrderResultInfo.setCardEnabledFlag("1");
|
|
|
+ }else {
|
|
|
+ payOrderResultInfo.setCardEnabledFlag("0");
|
|
|
+ }
|
|
|
+ }else {
|
|
|
+ //不共享,则查看油站电子卡是否开启
|
|
|
+ if(params.get("cardEnabledFlag").toString().equals("1")){
|
|
|
+ payOrderResultInfo.setCardEnabledFlag("1");
|
|
|
+ }else {
|
|
|
+ payOrderResultInfo.setCardEnabledFlag("0");
|
|
|
+ }
|
|
|
+ }
|
|
|
+ //电子卡功能是否开启
|
|
|
+ logger.info("油站是否开启电子会员卡功能: " +payOrderResultInfo.getCardEnabledFlag());
|
|
|
+ if(payOrderResultInfo.getCardEnabledFlag().equals("1")){
|
|
|
payOrderResultInfo.setDzkAmt(receivableAmt.toString());
|
|
|
payOrderResultInfo.setDzkDiscountAmt("0");
|
|
|
CustomerCardSetting customerCardSetting = new CustomerCardSetting();
|
|
|
customerCardSetting.setStationId(Integer.valueOf(params.get("stationId").toString()));
|
|
|
- if(params.get("cardRuleFlag").toString().equals("1")){
|
|
|
+ if(params.get("cardRuleFlagGroup").toString().equals("1")){
|
|
|
customerCardSetting.setStationId(Integer.valueOf(params.get("groupId").toString()));
|
|
|
}
|
|
|
List<CustomerCardSetting> cardRechargeSettingList = electronicMembershipCardService.getCardRechargeSettingList(customerCardSetting);
|
|
@@ -642,7 +713,7 @@ public class PayOrderController {
|
|
|
customerElectronicCard.setMobilePhone(params.get("userPhone").toString());
|
|
|
customerElectronicCard.setCustomerName(params.get("customerName").toString());
|
|
|
//查询客户余额和卡的类型
|
|
|
- Map<String, String> map = this.selectCardBalance(customerElectronicCard);
|
|
|
+ Map<String, String> map = this.selectCardBalance(customerElectronicCard, params);
|
|
|
payOrderResultInfo.setBalance(map.get("balance"));
|
|
|
payOrderResultInfo.setOilsCardFlag(map.get("oilsCardFlag"));
|
|
|
payOrderResultInfo.setCardOilsType(map.get("cardOilsType"));
|
|
@@ -651,22 +722,19 @@ public class PayOrderController {
|
|
|
}
|
|
|
|
|
|
//查询用户电子会员卡余额
|
|
|
- public Map<String, String> selectCardBalance(CustomerElectronicCard card) {
|
|
|
+ public Map<String, String> selectCardBalance(CustomerElectronicCard card, Map params) {
|
|
|
CustomerElectronicCard customerElectronicCard = new CustomerElectronicCard();
|
|
|
customerElectronicCard.setCardOilsType(card.getCardOilsType());
|
|
|
customerElectronicCard.setStationId(card.getStationId());
|
|
|
customerElectronicCard.setUnionId(card.getUnionId());
|
|
|
- BigDecimal balance = null;
|
|
|
+ BigDecimal balance = new BigDecimal(0);
|
|
|
String cardOilsType1 ="";
|
|
|
Map<String, String> result = new HashMap<>();
|
|
|
- StationInfo stationInfo = new StationInfo();
|
|
|
- stationInfo.setStationId(card.getStationId());
|
|
|
- StationInfo stationInfos = stationService.selectStationInfo(stationInfo);
|
|
|
CustomerCardSetting customerCardSetting = new CustomerCardSetting();
|
|
|
customerCardSetting.setStationId(card.getStationId());
|
|
|
- if(stationInfos.getCardRuleFlag().equals("1")){
|
|
|
- customerCardSetting.setStationId(stationInfos.getGroupId());
|
|
|
- customerElectronicCard.setStationId(stationInfos.getGroupId());
|
|
|
+ if(params.get("cardRuleFlagGroup").equals("1")){ //
|
|
|
+ customerCardSetting.setStationId(Integer.valueOf(params.get("groupId").toString()));
|
|
|
+ customerElectronicCard.setStationId(Integer.valueOf(params.get("groupId").toString()));
|
|
|
}
|
|
|
List<CustomerCardSetting> cardRechargeSettingList = electronicMembershipCardService.getCardRechargeSettingList(customerCardSetting);
|
|
|
if(cardRechargeSettingList !=null && cardRechargeSettingList.size()>0){
|