修改

YijiaRestful/src/main/java/com/platform/yijia/service/impl/PayOrderServiceImpl.java

@@ -10,6 +10,7 @@ import com.platform.yijia.pojo.PayOrder;
 import com.platform.yijia.pojo.PayOrderExample;
 import com.platform.yijia.service.AppUserInfoService;
 import com.platform.yijia.service.PayOrderService;
+import com.platform.yijia.service.StationService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -30,6 +31,8 @@ public class PayOrderServiceImpl implements PayOrderService {
     private PayOrderMapper payOrderMapper;
     @Resource
     private AppUserInfoService appUserInfoService;
+    @Resource
+    private StationService stationService;
 
     /*
      * 添加订单信息
@@ -148,6 +151,10 @@ public class PayOrderServiceImpl implements PayOrderService {
         }else if(payOrderRequest.getOrderType().equals("2")){       //订单类型等于2时表示非油品
             String oilName = payOrderRequest.getOilName();
             payOrder.setOilName(oilName);      //非油品名称
+            Map<String, String> m = stationService.getStationAppIdAndAppSecret(payOrderRequest.getStationId());
+            if(m.containsKey("stationName") && m.get("stationName") !=null){
+                payOrder.setStationName(m.get("stationName"));
+            }
             payOrder.setReceivableAmt(payOrderRequest.getReceivableAmt());  //非油品应收金额
             payOrder.setAmt(Double.valueOf(payOrderRequest.getAmt()));  //非油品金额
             //数据落地

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

@@ -442,6 +442,7 @@
   <select id="getStationAppIdAndAppSecret" parameterType="Integer" resultType="Map">
     SELECT
       mno             AS mno,
+      dept_name       AS stationName,
       app_id          AS appId,
       app_secret      AS appSecret,
       gzh_app_id      AS gzhAppId,