Merge remote-tracking branch 'origin/dev_goblin' into dev_goblin

liquidnet-bus-api/liquidnet-service-dragon-api/src/main/java/com/liquidnet/service/dragon/constant/DragonConstant.java

@@ -17,6 +17,8 @@ public class DragonConstant {
     public static final String REFUND_TYPE_APP_UNION="APPUNIONPAY";//,"微信内网页、微信公众号"),
     public static final String REFUND_TYPE_APPLET_DOUYIN="APPLETDOUYINPAY";//,"applet 抖音支付"),
     public static final String REFUND_TYPE_APPLET_WEPAY="APPLETWEPAY";//,"微信小程序");
+    public static final String REFUND_TYPE_MICROPAY_WEPAY="MICROPAYWEPAY";//,"扫码枪微信支付");
+    public static final String REFUND_TYPE_MICROPAY_ALIPAY="MICROPAYALIPAY";//,"扫码枪微信支付");
 
 
     public static final String REFUND_REDIS_KET="dragon:refund:refundCode:";// 订单号对应回调地址

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinGoodsSkuInfoDetailVo.java

@@ -36,6 +36,8 @@ public class GoblinGoodsSkuInfoDetailVo implements Serializable, Cloneable {
     private boolean stockLess;
     @ApiModelProperty(position = 13, value = "可以购买数量")
     private int canBuy;
+    @ApiModelProperty(position = 13, value = "单品的名称[100]")
+    private String name;
 
     @ApiModelProperty(position = 26, value = "限量[0-无限制|X:限购数量]")
     private Integer buyLimit;

liquidnet-bus-service/liquidnet-service-dragon/liquidnet-service-dragon-impl/src/main/java/com/liquidnet/service/dragon/service/impl/DragonOrderRefundsServiceImpl.java

@@ -40,16 +40,14 @@ import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
-import springfox.documentation.spring.web.json.Json;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
 import java.math.BigDecimal;
-import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
-import java.util.*;
+import java.util.HashMap;
 import java.util.Map;
 import java.util.SortedMap;
 import java.util.TreeMap;
@@ -105,6 +103,9 @@ public class DragonOrderRefundsServiceImpl implements IDragonOrderRefundsService
                     case DragonConstant.REFUND_TYPE_APP_WEPAY:
                         dto = weyPayRefund(code, orderRefundCode, code, reason, price, priceTotal, paymentId, paymentType, localWePayCallBackUrl, nowTime);
                         break;
+                    case DragonConstant.REFUND_TYPE_MICROPAY_ALIPAY:
+                        dto = aliPayRefund(code, orderRefundCode, code, reason, price, paymentId, paymentType, nowTime);
+                        break;
                     case DragonConstant.REFUND_TYPE_WAP_WEPAY:
                         dto = weyPayRefund(code, orderRefundCode, code, reason, price, priceTotal, paymentId, paymentType, localWePayCallBackUrl, nowTime);
                         break;
@@ -114,6 +115,9 @@ public class DragonOrderRefundsServiceImpl implements IDragonOrderRefundsService
                     case DragonConstant.REFUND_TYPE_JS_WEPAY:
                         dto = weyPayRefund(code, orderRefundCode, code, reason, price, priceTotal, paymentId, paymentType, localWePayCallBackUrl, nowTime);
                         break;
+                    case DragonConstant.REFUND_TYPE_MICROPAY_WEPAY:
+                        dto = weyPayRefund(code, orderRefundCode, code, reason, price, priceTotal, paymentId, paymentType, localWePayCallBackUrl, nowTime);
+                        break;
                     case DragonConstant.REFUND_TYPE_APPLET_WEPAY:
                         dto = weyPayRefund(code, orderRefundCode, code, reason, price, priceTotal, paymentId, paymentType, localWePayCallBackUrl, nowTime);
                         break;

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/GoblinOrderServiceImpl.java

@@ -344,14 +344,13 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
             storeOrder.setPriceExpress(BigDecimal.ZERO);
         }
         storeOrder.setPriceTotal(storeTotalPrice.add(storeOrder.getPriceExpress()));
-        storeOrder.setPriceActual(storeOrder.getPriceTotal().subtract(voucherPrice));
+        storeOrder.setPriceActual(storeOrder.getPriceTotal().subtract(voucherPrice).subtract(storeVoucherPrice));
         storeOrder.setPriceRefund(BigDecimal.ZERO);
         storeOrder.setPriceCoupon(voucherPrice);
         storeOrder.setStorePriceCoupon(storeVoucherPrice);
         storeOrder.setPriceVoucher(voucherPrice.add(storeVoucherPrice).add(voucherMarket));
         storeOrder.setStatus(0);
         storeOrder.setUcouponId(platVoucherCode);
-        storeOrder.setUcouponId(platVoucherCode);
         storeOrder.setStoreCouponId(platVoucherCode);
         storeOrder.setPayType(param.getPayType());
         storeOrder.setDeviceFrom(param.getDeviceFrom());
@@ -489,7 +488,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
             storeOrder.setPayCode(payCode);
             sqlDataOrder.add(new Object[]{
                     storeOrder.getMasterOrderCode(), storeOrder.getOrderId(), storeOrder.getStoreId(), storeOrder.getStoreName(), storeOrder.getOrderCode(), storeOrder.getUserId(), storeOrder.getUserName(), storeOrder.getUserMobile(), storeOrder.getPriceTotal(), storeOrder.getPayCode(),
-                    storeOrder.getPriceActual(), storeOrder.getPriceRefund(), storeOrder.getPriceExpress(), storeOrder.getPriceCoupon(), storeOrder.getPriceVoucher(), storeOrder.getStorePriceCoupon(), storeOrder.getStatus(), storeOrder.getUcouponId(), storeOrder.getStoreCouponId(), storeOrder.getPayType(), storeOrder.getDeviceFrom(),
+                    storeOrder.getPriceActual(), storeOrder.getPriceRefund(), storeOrder.getPriceExpress(), storeOrder.getPriceCoupon(), storeOrder.getStorePriceCoupon(), storeOrder.getPriceVoucher(), storeOrder.getStatus(), storeOrder.getUcouponId(), storeOrder.getStoreCouponId(), storeOrder.getPayType(), storeOrder.getDeviceFrom(),
                     storeOrder.getSource(), storeOrder.getVersion(), storeOrder.getIsMember(), storeOrder.getOrderType(), storeOrder.getWriteOffCode(), storeOrder.getPayCountdownMinute(), storeOrder.getIpAddress(), storeOrder.getMarketId(), storeOrder.getMarketType(), storeOrder.getCreatedAt()
             });
             GoblinOrderAttr orderAttr = item.getOrderAttr();

liquidnet-bus-service/liquidnet-service-notify/liquidnet-service-notify-impl/src/main/java/com/liquidnet/service/dragon/service/impl/DragonOrderRefundsServiceImpl.java

@@ -100,6 +100,9 @@ public class DragonOrderRefundsServiceImpl implements IDragonOrderRefundsService
                     case DragonConstant.REFUND_TYPE_WEB_ALIPAY:
                         dto = aliPayRefund(code, orderRefundCode, code, reason, price, paymentId, paymentType, nowTime);
                         break;
+                    case DragonConstant.REFUND_TYPE_MICROPAY_ALIPAY:
+                        dto = aliPayRefund(code, orderRefundCode, code, reason, price, paymentId, paymentType, nowTime);
+                        break;
                     case DragonConstant.REFUND_TYPE_APP_WEPAY:
                         dto = weyPayRefund(code, orderRefundCode, code, reason, price, priceTotal, paymentId, paymentType, localWePayCallBackUrl, nowTime);
                         break;
@@ -112,6 +115,9 @@ public class DragonOrderRefundsServiceImpl implements IDragonOrderRefundsService
                     case DragonConstant.REFUND_TYPE_JS_WEPAY:
                         dto = weyPayRefund(code, orderRefundCode, code, reason, price, priceTotal, paymentId, paymentType, localWePayCallBackUrl, nowTime);
                         break;
+                    case DragonConstant.REFUND_TYPE_MICROPAY_WEPAY:
+                        dto = weyPayRefund(code, orderRefundCode, code, reason, price, priceTotal, paymentId, paymentType, localWePayCallBackUrl, nowTime);
+                        break;
                     case DragonConstant.REFUND_TYPE_APPLET_WEPAY:
                         dto = weyPayRefund(code, orderRefundCode, code, reason, price, priceTotal, paymentId, paymentType, localWePayCallBackUrl, nowTime);
                         break;