提交代码

hai-cweb/src/main/java/com/cweb/controller/HighGasController.java

@@ -92,6 +92,11 @@ public class HighGasController {
             if (region != null) {
                 List<Map<String, Object>> storeList = highGasOilPriceService.getStoreListByOilNo(storeName,region.getRegionId(), oilNoName);
                 for (Map<String, Object> store : storeList) {
+                    if (StringUtils.isNotBlank(MapUtils.getString(store, "store_logo"))) {
+                        store.put("store_logo", CommonSysConst.getSysConfig().getHsgDomainName() +"/filesystem/"+MapUtils.getString(store, "store_logo"));
+                    } else {
+                        store.put("store_logo", null);
+                    }
                     double distance = CoordCommonUtil.getDistance(Double.valueOf(store.get("latitude").toString()), Double.valueOf(store.get("longitude").toString()), Double.valueOf(latitude), Double.valueOf(longitude));
                     store.put("distance", Math.round(distance/100d)/10d);
                 }
@@ -230,7 +235,7 @@ public class HighGasController {
                 param.put("gasLogoBig", CommonSysConst.getSysConfig().getHsgDomainName()+"/filesystem/"+store.getStoreLogo());
                 param.put("gasLogoSmall", CommonSysConst.getSysConfig().getHsgDomainName()+"/filesystem/"+store.getStoreLogo());
                 param.put("gasAddressLatitude", store.getLatitude());
-                param.put("gasAddressLongitude", store.getLatitude());
+                param.put("gasAddressLongitude", store.getLongitude());
                 // 距离
                 double distance = CoordCommonUtil.getDistance(Double.valueOf(param.get("gasAddressLatitude").toString()), Double.valueOf(param.get("gasAddressLongitude").toString()), Double.valueOf(latitude), Double.valueOf(longitude));
                 param.put("distance", Math.round(distance/100d)/10d);

hai-service/src/main/java/com/hai/dao/HighOrderMapperExt.java

@@ -1084,6 +1084,7 @@ public interface HighOrderMapperExt {
     @Select({
             "<script> " +
             " select " +
+            " b.id orderId," +
             " b.order_no orderNo," +
             " a.gas_order_no gasOrderNo," +
             " b.pay_type payType," +

hai-service/src/main/java/com/hai/model/GasOrderModel.java

@@ -9,6 +9,7 @@ import java.util.Date;
  */
 public class GasOrderModel {
 
+    private Long orderId;
     private String orderNo;
     private String gasOrderNo;
     private Integer payType;
@@ -32,6 +33,14 @@ public class GasOrderModel {
     private Date payTime;
     private Date refundTime;
 
+    public Long getOrderId() {
+        return orderId;
+    }
+
+    public void setOrderId(Long orderId) {
+        this.orderId = orderId;
+    }
+
     public String getGasOilType() {
         return gasOilType;
     }

hai-service/src/main/java/com/hai/service/impl/HighMerchantStoreServiceImpl.java

@@ -63,9 +63,9 @@ public class HighMerchantStoreServiceImpl implements HighMerchantStoreService {
         secUserService.addUser(highMerchantStore.getSecUser());
 
         // 绑定设备
-        if (StringUtils.isBlank(highMerchantStore.getDeviceKey())
+        if (StringUtils.isNotBlank(highMerchantStore.getDeviceKey())
-                && StringUtils.isBlank(highMerchantStore.getDeviceSn())
+                && StringUtils.isNotBlank(highMerchantStore.getDeviceSn())
-                && StringUtils.isBlank(highMerchantStore.getDeviceName())) {
+                && StringUtils.isNotBlank(highMerchantStore.getDeviceName())) {
             SpPrinterConfig sp = new SpPrinterConfig();
             JSONObject jsonObject = JSONObject.parseObject(sp.addPrinter(highMerchantStore.getDeviceSn(), highMerchantStore.getDeviceKey(), highMerchantStore.getDeviceName()));
             if (!jsonObject.getLong("errorcode").equals(0)) {