Merge branch 'master' of hyq/kmall-pt into master

kmall-admin/src/main/java/com/kmall/admin/controller/OrderController.java

@@ -20,6 +20,7 @@ import com.kmall.common.utils.wechat.wxglobal.WechatGlobalUtil;
 import com.kmall.common.utils.wechat.wxglobal.dto.WechatGlobalRefundApiResult;
 import net.sf.json.JSONObject;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.log4j.Logger;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -39,6 +40,7 @@ import java.util.Objects;
 @RestController
 @RequestMapping("order")
 public class OrderController {
+    private Logger logger = Logger.getLogger(OrderController.class);
     @Autowired
     private OrderService orderService;
     @Autowired
@@ -385,6 +387,9 @@ public class OrderController {
     private String wxRefund(OrderEntity orderInfo,Double totalActualPrice){
         WechatRefundApiResult result = WechatUtil.wxRefund(orderInfo.getMerchOrderSn().toString(), totalActualPrice,
                 orderInfo.getActualPrice().doubleValue());
+        System.out.println("result:"+result);
+        System.out.println("resultCode:"+result.getResult_code());
+        System.out.println("success:"+WechatUtil.WXTradeState.SUCCESS.getCode());
         if (result.getResult_code().equals(WechatUtil.WXTradeState.SUCCESS.getCode())) {
             orderService.refund(orderInfo, result);
         } else {

kmall-admin/src/main/resources/conf/express-kdn.properties

@@ -9,7 +9,7 @@ kdn.dev.businessId=1302764
 #电商加密私钥，快递鸟提供
 kdn.dev.appKey=d7e59ac9-88f4-4ba3-a391-b95076cfc622
 #快递鸟请求url
-kdn.dev.url=http://api.kdniao.cc/Ebusiness/EbusinessOrderHandle.aspx
+kdn.dev.url=http://api.kdniao.com/Ebusiness/EbusinessOrderHandle.aspx
 
 
 
@@ -19,6 +19,6 @@ kdn.prod.businessId=1396325
 #电商加密私钥，快递鸟提供
 kdn.prod.appKey=928c373d-9481-4ce2-817a-a28863766a4f
 #快递鸟请求url
-kdn.prod.url=http://api.kdniao.cc/Ebusiness/EbusinessOrderHandle.aspx
+kdn.prod.url=http://api.kdniao.com/Ebusiness/EbusinessOrderHandle.aspx
 
 

kmall-api/src/main/java/com/kmall/api/service/ApiOrderService.java

@@ -435,7 +435,7 @@ public class ApiOrderService {
         String thirdMerchSn = "";
         StoreVo storeVo = apiStoreMapper.queryObject(storeId);
         if(storeVo != null){
-            thirdMerchSn = storeVo.getThirdPartyMerchCode();
+            thirdMerchSn = storeVo.getThirdPartyMerchCode()==null?"":storeVo.getThirdPartyMerchCode();
         }
         //一级商户 + 二级商户（拼音首字母）+ 三级商户 + 业务类型 + 编号
         String orderSn = oneMerchName + merchShortName + thirdMerchSn + bizType + CommonUtil.generateOrderNumber();

kmall-api/src/main/resources/mybatis/mapper/ApiStoreMapper.xml

@@ -163,7 +163,7 @@
         create_time,
         moder_sn,
         mod_time,
-        tstm,third_party_merch_code,third_party_merch_name,
+        tstm,third_party_merch_code,third_party_merch_name
         from mall_store a
         WHERE 1=1
         <if test="province_name != null and province_name.trim() != ''">

kmall-common/src/main/java/com/kmall/common/utils/wechat/WechatUtil.java

@@ -132,6 +132,7 @@ public class WechatUtil {
         WechatRefundApiResult result =
                 (WechatRefundApiResult) XmlUtil.xmlStrToBean(reponseXml, WechatRefundApiResult.class);
         result.setOut_refund_no((String) params.get("out_refund_no"));
+        logger.info("-----------result : "+result);
         return result;
     }