Merge branch 'master' of gitlab.freemud.com:order-group-application/order-group into qa

order-application-service/src/main/java/cn/freemud/service/impl/OrderAdapterServiceImpl.java

@@ -178,6 +178,9 @@ public class OrderAdapterServiceImpl implements OrderAdapterService {
 
     @Override
     public String paySuccessCallback(PaysuccessNoticeMessage message) {
+        if (StringUtils.isEmpty(message.getTrans_id())){
+            return orderAdapter.newSendPayFaileMessage();
+        }
         //添加分布式锁，如果没有取得锁直接返回失败；整个方法执行完毕后会删掉该锁
         String paySuccessKey = PAY_SUCCESS_KEY + message.getTrans_id();
         if(!LockUtils.lockAfter(redisCache.getRedisTemplate(), paySuccessKey)){

order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

@@ -561,7 +561,7 @@ public class OrderServiceImpl implements Orderservice {
         message.setTotal_fee(newMessage.getTotalAmount() == null ? 0 : newMessage.getTotalAmount());
         message.setOpenid(StringUtils.isBlank(newMessage.getOpenId()) ? "" : newMessage.getOpenId());
         message.setPlatform_coupon(newMessage.getPlatformCoupon() == null ? 0 : newMessage.getPlatformCoupon());
-        message.setMerchant_coupon(newMessage.getPlatformCoupon() == null ? 0 : newMessage.getPlatformCoupon());
+        message.setMerchant_coupon(newMessage.getMerchantCoupon() == null ? 0 : newMessage.getMerchantCoupon());
         message.setPaid_no(newMessage.getThirdPartTradeNo());
         message.setEndTransId(newMessage.getEndTransId());
         message.setPlatformMchId(newMessage.getPlatformMchId());