|
@@ -229,8 +229,8 @@ public class ResponseWechatPayHandler {
|
|
|
Integer integral = amount * (orderItem.getItemNum() * 3 - orderItem.getItemNum());
|
|
|
allIntegral += integral;
|
|
|
} else {
|
|
|
- Integer integral = amount * (orderItem.getItemNum() * 3);
|
|
|
- allBrushAmount += integral;
|
|
|
+
|
|
|
+ allBrushAmount += amount * orderItem.getItemNum();
|
|
|
}
|
|
|
}
|
|
|
if (couponAmount > 0) {
|
|
@@ -341,7 +341,7 @@ public class ResponseWechatPayHandler {
|
|
|
|
|
|
* 销售订单支付回调方法 -- tooth订单返回
|
|
|
*/
|
|
|
-
|
|
|
+
|
|
|
public synchronized void testOrderPayBack(HttpServletRequest request,
|
|
|
HttpServletResponse response, String orderId, String openId) throws IOException {
|
|
|
String orderIdMD5 = orderId;
|
|
@@ -408,8 +408,8 @@ public class ResponseWechatPayHandler {
|
|
|
Integer integral = amount * (orderItem.getItemNum() * 3 - orderItem.getItemNum());
|
|
|
allIntegral += integral;
|
|
|
} else {
|
|
|
- Integer integral = amount * (orderItem.getItemNum() * 3);
|
|
|
- allBrushAmount += integral;
|
|
|
+
|
|
|
+ allBrushAmount += amount * orderItem.getItemNum();
|
|
|
}
|
|
|
}
|
|
|
if (couponAmount > 0) {
|
|
@@ -452,36 +452,6 @@ public class ResponseWechatPayHandler {
|
|
|
} catch (Exception e) {
|
|
|
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
}
|
|
|
}
|
|
|
}
|