积分商城

tooth-common-tool/src/main/java/com/iamberry/wechat/tools/ResultInfo.java

@@ -319,9 +319,9 @@ public class ResultInfo {
 	/**
 	 * 获取RST系统产品信息接口地址
 	 */
-	public static String GET_MACHINE_INFO = "https://rst.iamberry.com/mcahine/getMachineInfo?barCode=";
-//	public static String GET_MACHINE_INFO = "http://my.com:9797/mcahine/getMachineInfo?barCode=";
-	public static String GET_TOOTH_INFO = "https://rst.iamberry.com/mcahine/listToothInfo";
-//	public static String GET_TOOTH_INFO = "http://my.com:9797/mcahine/listToothInfo";
+//	public static String GET_MACHINE_INFO = "https://rst.iamberry.com/mcahine/getMachineInfo?barCode=";
+	public static String GET_MACHINE_INFO = "http://my.com:9797/mcahine/getMachineInfo?barCode=";
+//	public static String GET_TOOTH_INFO = "https://rst.iamberry.com/mcahine/listToothInfo";
+	public static String GET_TOOTH_INFO = "http://my.com:9797/mcahine/listToothInfo";
 
 }

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/integral/IntegralOrderServiceImpl.java

@@ -254,7 +254,7 @@ public class IntegralOrderServiceImpl  implements IntegralOrderService {
         Member mem = new Member();
         mem.setUserId(member.getUserId());
         mem.setUserSurplusIntegral(member.getUserSurplusIntegral()-dfbiTotal);  //剩余积分		朵粉币
-        mem.setUserIntegral(member.getUserIntegral()+dfbiTotal);    //已用积分
+        mem.setUserUseIntegral(member.getUserUseIntegral()+dfbiTotal);    //已用积分
         flag = memberMapper.updateMemberByUserId(mem);
         if(flag < 1){
             throw new RuntimeException("修改用户朵粉币失败");

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/pay/ResponseWechatPayHandler.java

@@ -229,8 +229,8 @@ public class ResponseWechatPayHandler {
 								Integer integral = amount * (orderItem.getItemNum() * 3 - orderItem.getItemNum());		//计算牙刷*2的金额
 								allIntegral += integral;
 							} else {
-								Integer integral = amount * (orderItem.getItemNum() * 3);
-								allBrushAmount += integral;
+								//Integer integral = amount * (orderItem.getItemNum() * 3);
+								allBrushAmount += amount * orderItem.getItemNum();		//加的是刷牙总金额
 							}
 						}
 						if (couponAmount > 0) {  //有优惠券减去优惠券的金额 -- 先用牙刷总金额减去优惠券
@@ -341,7 +341,7 @@ public class ResponseWechatPayHandler {
 	/**
 	 * 销售订单支付回调方法 -- tooth订单返回
 	 */
-	//@RequestMapping("/testOrderPayBack")
+//	@RequestMapping("/testOrderPayBack")
 	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());		//计算牙刷*2的金额
 						allIntegral += integral;
 					} else {
-						Integer integral = amount * (orderItem.getItemNum() * 3);
-						allBrushAmount += integral;
+						//Integer integral = amount * (orderItem.getItemNum() * 3);
+						allBrushAmount += amount * orderItem.getItemNum();		//加的是刷牙总金额
 					}
 				}
 				if (couponAmount > 0) {  //有优惠券减去优惠券的金额 -- 先用牙刷总金额减去优惠券
@@ -452,36 +452,6 @@ public class ResponseWechatPayHandler {
 				} catch (Exception e) {
 					// TODO: handle exception
 				}
-
-//						//推送消息到微信
-//						DecimalFormat df = new DecimalFormat("0.00");
-//						String payMoney = df.format((float) or.getSalesYetAmount() / 100) + "元";
-//						try {
-//							sendMessageUtil.probationPaySuccess(
-//									ResultInfo.PAYSUCCESS,
-//									payMoney,
-//									orderItemList.get(0).getItemProductName() + "...",
-//									ResultInfo.sendRemark1,
-//									order.getSalesOpenid(),
-//									ResultInfo.ORDER_DETAIL + order.getSalesOrderid());
-//						} catch (Exception e) {
-//							System.out.println("推送支付成功消息失败!");
-//						}
-				//System.out.println("===========pay 201  插入返利到百胜完成==============");
-//						try {    //修改用户购买记录为已购买
-//							memberService.updateIsBaughtByOpenid(openId, 2);
-//							//更新用户绑定状态
-//							Member member = memberService.getMemberByUserOpenId(order.getSalesOpenid());
-//							if (member.getUserIsFlag() != null && member.getUserIsFlag() == 1) {
-//								member.setUserIsFlag(2);//终身绑定
-//								homeService.updateMemberIsFlagByOpenid(member);
-//							}
-//							QrcodeResult qr = temporaryQrcodeService.applyTempQrcode(order.getSalesOpenid());//为用户生成二维码
-//							inLongLogger.info("为用户-->" + order.getSalesOpenid() + ",生成二维码:" + qr.getQroceUrl());
-//						} catch (Exception e) {
-//							System.out.println("修改已购买状态和终身绑定失败!");
-//							e.printStackTrace();
-//						}
 			}
 		}
 	}