修改

YijiaRestful/src/main/java/com/platform/yijia/config/WebMvcConfig.java

@@ -6,8 +6,11 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 import javax.annotation.Resource;
 
-/**
- * 添加与WebMvc相关的自定义配置
+/***
+ * <Title> WebMvcConfig </Title>
+ * <Description> 添加与WebMvc相关的自定义配置 </Description>
+ * @Author JK
+ * @Date 2021年5月25日
  */
 @Configuration
 public class WebMvcConfig implements WebMvcConfigurer {

YijiaRestful/src/main/java/com/platform/yijia/controller/ElectronicMembershipCardController.java

@@ -126,14 +126,14 @@ public class ElectronicMembershipCardController {
             //String openId = rechargeBalance.getOpenId();    //公众号的openId
             Integer stationId = rechargeBalance.getStationId();
             //BigDecimal presentAmt = new BigDecimal(rechargeBalance.getPresentAmt());
-            String payType = rechargeBalance.getPayType();
+            //String payType = rechargeBalance.getPayType();
             String customerName = rechargeBalance.getCustomerName();
             String cardOilsType = rechargeBalance.getCardOilsType();
             String unionId = rechargeBalance.getUnionId();
             String stationName = rechargeBalance.getStationName();
             String stationCardEnabledFlag = electronicMembershipCardService.getStationCardEnabledFlag(stationId);
             logger.info("充值金额："+amt);
-            logger.info("支付类型："+payType);
+            //logger.info("支付类型："+payType);
             logger.info("充值卡类型："+cardOilsType);
             logger.info("充值金额："+amt);
             logger.info("油站ID："+stationId);
@@ -244,7 +244,7 @@ public class ElectronicMembershipCardController {
                 customerCardUseRecord.setStationName(stationName);
                 customerCardUseRecord.setCustomerName(customerName);
                 customerCardUseRecord.setUsageType("+");
-                customerCardUseRecord.setPayType(payType);      //1表示微信
+                //customerCardUseRecord.setPayType(payType);      //1表示微信
                 customerCardUseRecord.setCreateTime(new Date());
                 customerCardUseRecord.setStatus("0");
 
@@ -778,7 +778,8 @@ public class ElectronicMembershipCardController {
         Gson gson =new Gson();
         //返回结果集
         ResultData resultData = null;
-        if(rechargeBalance !=null){
+        if(rechargeBalance !=null && StringUtils.isNotBlank(rechargeBalance.getAmt()) && StringUtils.isNotBlank(rechargeBalance.getOpenId())
+                && StringUtils.isNotBlank(rechargeBalance.getUserType()) && rechargeBalance.getStationId() !=null && StringUtils.isNotBlank(rechargeBalance.getOrderNo())){
             String amt = rechargeBalance.getAmt();
             String openId = rechargeBalance.getOpenId();    //公众号的openId
             Integer stationId = rechargeBalance.getStationId();
@@ -889,6 +890,8 @@ public class ElectronicMembershipCardController {
                             resultData=ResultData.error(CodeMsg.YEWU_FAIL,"订单支付失败");
                             e.printStackTrace();
                         }
+                    }else {
+                        resultData = ResultData.error(CodeMsg.STATION_NULL_INFO);
                     }
                 }else {
                     resultData = ResultData.error(CodeMsg.ALREADY_PAY);

YijiaRestful/src/main/java/com/platform/yijia/controller/IntegralShoppingMallController.java

@@ -66,8 +66,26 @@ public class IntegralShoppingMallController {
         if(stationId !=null){
             IntegralShopPic integralShopPic = new IntegralShopPic();
             integralShopPic.setStationId(stationId);
-            IntegralShopPic integralShopPicList = integralShopPicService.getIntegralShopPicList(integralShopPic);
-            resultData=ResultData.success(integralShopPicList);
+            IntegralShopPic integralShopPics = integralShopPicService.getIntegralShopPicList(integralShopPic);
+            List<String> list = new ArrayList<>();
+            if(integralShopPics !=null && integralShopPics.getImage1() !=null){
+                list.add(integralShopPics.getImage1());
+            }
+            if(integralShopPics !=null && integralShopPics.getImage2() !=null){
+                list.add(integralShopPics.getImage2());
+            }
+            if(integralShopPics !=null && integralShopPics.getImage3() !=null){
+                list.add(integralShopPics.getImage3());
+            }
+            if(integralShopPics !=null && integralShopPics.getImage4() !=null){
+                list.add(integralShopPics.getImage4());
+            }
+            if(integralShopPics !=null && integralShopPics.getImage5() !=null){
+                list.add(integralShopPics.getImage5());
+            }
+            Map map = new HashMap();
+            map.put("listPic", list);
+            resultData=ResultData.success(map);
         }else {
             resultData=ResultData.error(CodeMsg.REQUEST_FAIL);
         }

YijiaRestful/src/main/java/com/platform/yijia/controller/StationController.java

@@ -50,7 +50,9 @@ public class StationController {
         if(StringUtils.isNotBlank(appId)){
             StationInfo stationInfo = new StationInfo();
             stationInfo.setAppId(appId);
+            logger.info("无经纬度获取油站列表所需参数appID："+appId);
             List<StationInfo> stationList = stationService.getStationListByAppId(stationInfo);
+            logger.info("无经纬度油站列表："+stationList.toString());
             resultData = ResultData.success(stationList);
         }else {
             resultData = ResultData.error(CodeMsg.REQUEST_FAIL);
@@ -183,6 +185,7 @@ public class StationController {
         //返回结果集
         ResultData resultData= null;
         if(StringUtils.isNotBlank(appId)){
+            logger.info("有经纬度获取油站列表所需参数appID："+appId);
             StationRequest stationRequest = new StationRequest();
             //StationInfo stationInfo = new StationInfo();
             stationRequest.setAppId(appId);
@@ -194,6 +197,7 @@ public class StationController {
                 stationRequest.setPageSize(pageSize);
                 //调用接口 根据坐标筛选距离最近的加油站
                 StationInfoVo stationInfoVo = stationService.stationInfoList(stationRequest);
+                logger.info("有经纬度获取油站列表："+stationInfoVo.toString());
                 resultData=ResultData.success(stationInfoVo);
             }else {
                 resultData=ResultData.error(CodeMsg.REQUEST_FAIL);

YijiaRestful/src/main/java/com/platform/yijia/pojo/CustomerCardSettingDetail.java

@@ -16,6 +16,6 @@ public class CustomerCardSettingDetail {
     private BigDecimal discountAmtStart;     //优惠条件金额起始值
     private BigDecimal discountAmtEnd;     //优惠条件金额结束值
     private BigDecimal presentAmt;          //赠送金额值或者赠送c充值金额的比例
-    private String  oilName;           //创建时间
+    private String  cardType;           //电子卡类型
     private String status;              //状态
 }

YijiaRestful/src/main/java/com/platform/yijia/pojo/IntegralWares.java

@@ -12,7 +12,6 @@ import java.util.Date;
 @Data
 public class IntegralWares {
     private Integer id;                 //'商品主键id',
-    private String waresType;           //'商品类别',
     private String waresName;           //'商品名称',
     private BigDecimal saleIntegral;    //'消费积分',
     private String waresPic;            //'商品图片',

YijiaRestful/src/main/java/com/platform/yijia/utils/CodeMsg.java

@@ -27,8 +27,7 @@ public class CodeMsg {
     public static CodeMsg YEWU_FAIL = new CodeMsg(006,"业务失败");
     public static CodeMsg NO_CARDENABLEFLAG = new CodeMsg(-2,"未启用电会员卡");
     public static CodeMsg ALREADY_PAY = new CodeMsg(-2,"该订单已支付");
-
-
+    public static CodeMsg STATION_NULL_INFO = new CodeMsg(-2,"无此油站或该油站暂无配置APPID与商户号");
     public static CodeMsg CHECK_DATA = new CodeMsg(007,"与后台检验不一致，请联系……");
     public static CodeMsg PARAMS_NUll = new CodeMsg(-2,"请求失败，必传参数不能为空！");
     public static CodeMsg WARSECOUNT_FAIL = new CodeMsg(-1,"库存不足");

YijiaRestful/src/main/resources/mapper/ElectronicMembershipCardMapper.xml

@@ -64,6 +64,7 @@
         <result column="discount_amt_start"         jdbcType="DECIMAL"      property="discountAmtStart" />
         <result column="discount_amt_end"           jdbcType="DECIMAL"      property="discountAmtEnd" />
         <result column="present_amt"                jdbcType="DECIMAL"      property="presentAmt"/>
+        <result column="card_type"                  jdbcType="VARCHAR"      property="cardType"/>
         <result column="status"                     jdbcType="VARCHAR"      property="status" />
     </resultMap>
 
@@ -88,6 +89,7 @@
             T2.discount_amt_start,
             T2.discount_amt_end,
             T2.present_amt,
+            T2.card_type,
             T2.status
         FROM
             customer_card_setting AS T1 LEFT JOIN customer_card_setting_detail AS T2 ON T1.id = T2.parent_id
@@ -100,7 +102,7 @@
                 AND FIND_IN_SET(#{cardOilsType}, T1.card_oils_type)
             </if>
             <if test="cardOilsType !=null">
-                AND T2.oil_name = #{cardOilsType}
+                AND T2.card_type = #{cardOilsType}
             </if>
         </where>
         <if test="orderBy !=null and orderBy !=''">

YijiaRestful/src/main/resources/mapper/IntegralWaresMapper.xml

@@ -4,7 +4,6 @@
   <!--返回结果-->
   <resultMap id="BaseResultMap" type="com.platform.yijia.pojo.IntegralWares">
     <id     column="id"              jdbcType="INTEGER"    property="id" />
-    <result column="wares_type"      jdbcType="VARCHAR"    property="waresType" />
     <result column="wares_name"      jdbcType="VARCHAR"    property="waresName" />
     <result column="sale_integral"   jdbcType="DECIMAL"    property="saleIntegral" />
     <result column="wares_pic"       jdbcType="VARCHAR"    property="waresPic" />
@@ -21,7 +20,7 @@
 
   <!--查询列-->
   <sql id="Base_Column_List">
-    id, wares_type, wares_name, sale_integral, wares_pic,
+    id, wares_name, sale_integral, wares_pic,
     wares_detail, wares_count, wares_out_count, wares_status,
     create_time, create_by, update_time, update_by
   </sql>